diff --git a/image/close_hkg/Frame1.png b/image/close_hkg/Frame1.png new file mode 100644 index 00000000..7a43d56e Binary files /dev/null and b/image/close_hkg/Frame1.png differ diff --git a/image/close_hkg/Frame10.png b/image/close_hkg/Frame10.png new file mode 100644 index 00000000..d2727ff0 Binary files /dev/null and b/image/close_hkg/Frame10.png differ diff --git a/image/close_hkg/Frame11.png b/image/close_hkg/Frame11.png new file mode 100644 index 00000000..1c737617 Binary files /dev/null and b/image/close_hkg/Frame11.png differ diff --git a/image/close_hkg/Frame12.png b/image/close_hkg/Frame12.png new file mode 100644 index 00000000..e05c2fe6 Binary files /dev/null and b/image/close_hkg/Frame12.png differ diff --git a/image/close_hkg/Frame13.png b/image/close_hkg/Frame13.png new file mode 100644 index 00000000..daa728db Binary files /dev/null and b/image/close_hkg/Frame13.png differ diff --git a/image/close_hkg/Frame14.png b/image/close_hkg/Frame14.png new file mode 100644 index 00000000..f8b63f68 Binary files /dev/null and b/image/close_hkg/Frame14.png differ diff --git a/image/close_hkg/Frame15.png b/image/close_hkg/Frame15.png new file mode 100644 index 00000000..cc71fdf7 Binary files /dev/null and b/image/close_hkg/Frame15.png differ diff --git a/image/close_hkg/Frame16.png b/image/close_hkg/Frame16.png new file mode 100644 index 00000000..086fdc6e Binary files /dev/null and b/image/close_hkg/Frame16.png differ diff --git a/image/close_hkg/Frame17.png b/image/close_hkg/Frame17.png new file mode 100644 index 00000000..50870424 Binary files /dev/null and b/image/close_hkg/Frame17.png differ diff --git a/image/close_hkg/Frame18.png b/image/close_hkg/Frame18.png new file mode 100644 index 00000000..b5ae0cde Binary files /dev/null and b/image/close_hkg/Frame18.png differ diff --git a/image/close_hkg/Frame19.png b/image/close_hkg/Frame19.png new file mode 100644 index 00000000..fa991c07 Binary files /dev/null and b/image/close_hkg/Frame19.png differ diff --git a/image/close_hkg/Frame2.png b/image/close_hkg/Frame2.png new file mode 100644 index 00000000..31a7d4be Binary files /dev/null and b/image/close_hkg/Frame2.png differ diff --git a/image/close_hkg/Frame20.png b/image/close_hkg/Frame20.png new file mode 100644 index 00000000..677d294c Binary files /dev/null and b/image/close_hkg/Frame20.png differ diff --git a/image/close_hkg/Frame3.png b/image/close_hkg/Frame3.png new file mode 100644 index 00000000..f24016c6 Binary files /dev/null and b/image/close_hkg/Frame3.png differ diff --git a/image/close_hkg/Frame4.png b/image/close_hkg/Frame4.png new file mode 100644 index 00000000..32d6d5cd Binary files /dev/null and b/image/close_hkg/Frame4.png differ diff --git a/image/close_hkg/Frame5.png b/image/close_hkg/Frame5.png new file mode 100644 index 00000000..5cfde2bd Binary files /dev/null and b/image/close_hkg/Frame5.png differ diff --git a/image/close_hkg/Frame6.png b/image/close_hkg/Frame6.png new file mode 100644 index 00000000..275b5a64 Binary files /dev/null and b/image/close_hkg/Frame6.png differ diff --git a/image/close_hkg/Frame7.png b/image/close_hkg/Frame7.png new file mode 100644 index 00000000..69859852 Binary files /dev/null and b/image/close_hkg/Frame7.png differ diff --git a/image/close_hkg/Frame8.png b/image/close_hkg/Frame8.png new file mode 100644 index 00000000..174339da Binary files /dev/null and b/image/close_hkg/Frame8.png differ diff --git a/image/close_hkg/Frame9.png b/image/close_hkg/Frame9.png new file mode 100644 index 00000000..272d7f18 Binary files /dev/null and b/image/close_hkg/Frame9.png differ diff --git a/image/close_hkg/img1.png b/image/close_hkg/img1.png new file mode 100644 index 00000000..5cab7610 Binary files /dev/null and b/image/close_hkg/img1.png differ diff --git a/image/collectiing_msc/text_13-2.png b/image/collectiing_msc/text_13-2.png index 6d9aeceb..86657a2b 100644 Binary files a/image/collectiing_msc/text_13-2.png and b/image/collectiing_msc/text_13-2.png differ diff --git a/image/collectiing_msc/text_13.png b/image/collectiing_msc/text_13.png index 126d926b..9d35db50 100644 Binary files a/image/collectiing_msc/text_13.png and b/image/collectiing_msc/text_13.png differ diff --git a/image/display_point_campaign_mmr/cancel_btn.png b/image/display_point_campaign_mmr/cancel_btn.png new file mode 100644 index 00000000..e8f32687 Binary files /dev/null and b/image/display_point_campaign_mmr/cancel_btn.png differ diff --git a/image/display_point_campaign_mmr/cancel_btn_pressed.png b/image/display_point_campaign_mmr/cancel_btn_pressed.png new file mode 100644 index 00000000..c363195f Binary files /dev/null and b/image/display_point_campaign_mmr/cancel_btn_pressed.png differ diff --git a/image/display_point_campaign_mmr/change_pass_btn.png b/image/display_point_campaign_mmr/change_pass_btn.png new file mode 100644 index 00000000..7806cc24 Binary files /dev/null and b/image/display_point_campaign_mmr/change_pass_btn.png differ diff --git a/image/display_point_campaign_mmr/change_pass_btn_pressed.png b/image/display_point_campaign_mmr/change_pass_btn_pressed.png new file mode 100644 index 00000000..3c9aaa46 Binary files /dev/null and b/image/display_point_campaign_mmr/change_pass_btn_pressed.png differ diff --git a/image/display_point_campaign_mmr/check_taobin_shell.png b/image/display_point_campaign_mmr/check_taobin_shell.png new file mode 100644 index 00000000..59086dfd Binary files /dev/null and b/image/display_point_campaign_mmr/check_taobin_shell.png differ diff --git a/image/display_point_campaign_mmr/check_taobin_shell_press.png b/image/display_point_campaign_mmr/check_taobin_shell_press.png new file mode 100644 index 00000000..d1b5594b Binary files /dev/null and b/image/display_point_campaign_mmr/check_taobin_shell_press.png differ diff --git a/image/display_point_campaign_mmr/luckydraw_detail_container.png b/image/display_point_campaign_mmr/luckydraw_detail_container.png new file mode 100644 index 00000000..159e70db Binary files /dev/null and b/image/display_point_campaign_mmr/luckydraw_detail_container.png differ diff --git a/image/display_point_campaign_mmr/topup_btn.png b/image/display_point_campaign_mmr/topup_btn.png new file mode 100644 index 00000000..17e10dca Binary files /dev/null and b/image/display_point_campaign_mmr/topup_btn.png differ diff --git a/image/display_point_campaign_mmr/topup_btn_pressed.png b/image/display_point_campaign_mmr/topup_btn_pressed.png new file mode 100644 index 00000000..d5189e73 Binary files /dev/null and b/image/display_point_campaign_mmr/topup_btn_pressed.png differ diff --git a/image/display_point_campaign_msc/cancel_btn.png b/image/display_point_campaign_msc/cancel_btn.png new file mode 100644 index 00000000..bb3e010d Binary files /dev/null and b/image/display_point_campaign_msc/cancel_btn.png differ diff --git a/image/display_point_campaign_msc/cancel_btn_pressed.png b/image/display_point_campaign_msc/cancel_btn_pressed.png new file mode 100644 index 00000000..0e221d7a Binary files /dev/null and b/image/display_point_campaign_msc/cancel_btn_pressed.png differ diff --git a/image/display_point_campaign_msc/change_pass_btn.png b/image/display_point_campaign_msc/change_pass_btn.png new file mode 100644 index 00000000..e6359ad0 Binary files /dev/null and b/image/display_point_campaign_msc/change_pass_btn.png differ diff --git a/image/display_point_campaign_msc/change_pass_btn_pressed.png b/image/display_point_campaign_msc/change_pass_btn_pressed.png new file mode 100644 index 00000000..c0239ed7 Binary files /dev/null and b/image/display_point_campaign_msc/change_pass_btn_pressed.png differ diff --git a/image/display_point_campaign_msc/check_taobin_shell.png b/image/display_point_campaign_msc/check_taobin_shell.png new file mode 100644 index 00000000..2bab75e1 Binary files /dev/null and b/image/display_point_campaign_msc/check_taobin_shell.png differ diff --git a/image/display_point_campaign_msc/check_taobin_shell_press.png b/image/display_point_campaign_msc/check_taobin_shell_press.png new file mode 100644 index 00000000..ef7c1b50 Binary files /dev/null and b/image/display_point_campaign_msc/check_taobin_shell_press.png differ diff --git a/image/display_point_campaign_msc/luckydraw_detail_container.png b/image/display_point_campaign_msc/luckydraw_detail_container.png new file mode 100644 index 00000000..0bc8098d Binary files /dev/null and b/image/display_point_campaign_msc/luckydraw_detail_container.png differ diff --git a/image/display_point_campaign_msc/topup_btn.png b/image/display_point_campaign_msc/topup_btn.png new file mode 100644 index 00000000..989f2056 Binary files /dev/null and b/image/display_point_campaign_msc/topup_btn.png differ diff --git a/image/display_point_campaign_msc/topup_btn_pressed.png b/image/display_point_campaign_msc/topup_btn_pressed.png new file mode 100644 index 00000000..754dfd52 Binary files /dev/null and b/image/display_point_campaign_msc/topup_btn_pressed.png differ diff --git a/image/display_point_msc/text8.png b/image/display_point_msc/text8.png index ddb4e7ad..32802ea0 100644 Binary files a/image/display_point_msc/text8.png and b/image/display_point_msc/text8.png differ diff --git a/image/display_point_msc/text8_28.png b/image/display_point_msc/text8_28.png index 38271257..cd261296 100644 Binary files a/image/display_point_msc/text8_28.png and b/image/display_point_msc/text8_28.png differ diff --git a/image/page_payment_msc/page_payment/bn_pay_with_code.png b/image/page_payment_msc/page_payment/bn_pay_with_code.png index 3a817c4d..81385612 100644 Binary files a/image/page_payment_msc/page_payment/bn_pay_with_code.png and b/image/page_payment_msc/page_payment/bn_pay_with_code.png differ diff --git a/image/page_payment_msc/page_payment/bn_pay_wtih_code.png b/image/page_payment_msc/page_payment/bn_pay_wtih_code.png deleted file mode 100644 index 81385612..00000000 Binary files a/image/page_payment_msc/page_payment/bn_pay_wtih_code.png and /dev/null differ diff --git a/image/page_payment_msc/page_payment/img_popup1.png b/image/page_payment_msc/page_payment/img_popup1.png index 2f3d0d8c..6e74210b 100644 Binary files a/image/page_payment_msc/page_payment/img_popup1.png and b/image/page_payment_msc/page_payment/img_popup1.png differ diff --git a/image/page_payment_msc/page_payment/loadingText.png b/image/page_payment_msc/page_payment/loadingText.png index 0c436dfb..0011edb7 100644 Binary files a/image/page_payment_msc/page_payment/loadingText.png and b/image/page_payment_msc/page_payment/loadingText.png differ diff --git a/image/topping_msc/Rectangle 291.png b/image/topping_msc/Rectangle 291.png new file mode 100644 index 00000000..2ce54030 Binary files /dev/null and b/image/topping_msc/Rectangle 291.png differ diff --git a/image/topping_msc/add_shot_img.png b/image/topping_msc/add_shot_img.png new file mode 100644 index 00000000..338f072c Binary files /dev/null and b/image/topping_msc/add_shot_img.png differ diff --git a/image/topping_msc/add_shot_img_2.png b/image/topping_msc/add_shot_img_2.png new file mode 100644 index 00000000..008c7148 Binary files /dev/null and b/image/topping_msc/add_shot_img_2.png differ diff --git a/image/topping_msc/block_strawlid.png b/image/topping_msc/block_strawlid.png new file mode 100644 index 00000000..bc3ef7f2 Binary files /dev/null and b/image/topping_msc/block_strawlid.png differ diff --git a/image/topping_msc/block_strawonly.png b/image/topping_msc/block_strawonly.png new file mode 100644 index 00000000..bbe6db8e Binary files /dev/null and b/image/topping_msc/block_strawonly.png differ diff --git a/image/topping_msc/bn_add.png b/image/topping_msc/bn_add.png new file mode 100644 index 00000000..21ed6b89 Binary files /dev/null and b/image/topping_msc/bn_add.png differ diff --git a/image/topping_msc/bn_brew1.png b/image/topping_msc/bn_brew1.png new file mode 100644 index 00000000..16067473 Binary files /dev/null and b/image/topping_msc/bn_brew1.png differ diff --git a/image/topping_msc/bn_brew2.png b/image/topping_msc/bn_brew2.png new file mode 100644 index 00000000..4709e6f7 Binary files /dev/null and b/image/topping_msc/bn_brew2.png differ diff --git a/image/topping_msc/bn_cancel.png b/image/topping_msc/bn_cancel.png new file mode 100644 index 00000000..c71f24d8 Binary files /dev/null and b/image/topping_msc/bn_cancel.png differ diff --git a/image/topping_msc/bn_next.png b/image/topping_msc/bn_next.png new file mode 100644 index 00000000..eccf142b Binary files /dev/null and b/image/topping_msc/bn_next.png differ diff --git a/image/topping_msc/bn_sugar1.png b/image/topping_msc/bn_sugar1.png new file mode 100644 index 00000000..cdd0ff32 Binary files /dev/null and b/image/topping_msc/bn_sugar1.png differ diff --git a/image/topping_msc/bn_sugar2.png b/image/topping_msc/bn_sugar2.png new file mode 100644 index 00000000..55212781 Binary files /dev/null and b/image/topping_msc/bn_sugar2.png differ diff --git a/image/topping_msc/bn_sugar3.png b/image/topping_msc/bn_sugar3.png new file mode 100644 index 00000000..a76b9c53 Binary files /dev/null and b/image/topping_msc/bn_sugar3.png differ diff --git a/image/topping_msc/bn_sugar4.png b/image/topping_msc/bn_sugar4.png new file mode 100644 index 00000000..e49e54e9 Binary files /dev/null and b/image/topping_msc/bn_sugar4.png differ diff --git a/image/topping_msc/bn_sugar5.png b/image/topping_msc/bn_sugar5.png new file mode 100644 index 00000000..bd5d1679 Binary files /dev/null and b/image/topping_msc/bn_sugar5.png differ diff --git a/image/topping_msc/bp_add.png b/image/topping_msc/bp_add.png new file mode 100644 index 00000000..34e026a4 Binary files /dev/null and b/image/topping_msc/bp_add.png differ diff --git a/image/topping_msc/bp_brew1.png b/image/topping_msc/bp_brew1.png new file mode 100644 index 00000000..e1a50099 Binary files /dev/null and b/image/topping_msc/bp_brew1.png differ diff --git a/image/topping_msc/bp_brew2.png b/image/topping_msc/bp_brew2.png new file mode 100644 index 00000000..bf732da4 Binary files /dev/null and b/image/topping_msc/bp_brew2.png differ diff --git a/image/topping_msc/bp_cancel.png b/image/topping_msc/bp_cancel.png new file mode 100644 index 00000000..da258d8b Binary files /dev/null and b/image/topping_msc/bp_cancel.png differ diff --git a/image/topping_msc/bp_next.png b/image/topping_msc/bp_next.png new file mode 100644 index 00000000..eb77676b Binary files /dev/null and b/image/topping_msc/bp_next.png differ diff --git a/image/topping_msc/bp_sugar1.png b/image/topping_msc/bp_sugar1.png new file mode 100644 index 00000000..26bb755d Binary files /dev/null and b/image/topping_msc/bp_sugar1.png differ diff --git a/image/topping_msc/bp_sugar2.png b/image/topping_msc/bp_sugar2.png new file mode 100644 index 00000000..6fb97b5f Binary files /dev/null and b/image/topping_msc/bp_sugar2.png differ diff --git a/image/topping_msc/bp_sugar3.png b/image/topping_msc/bp_sugar3.png new file mode 100644 index 00000000..f03aee97 Binary files /dev/null and b/image/topping_msc/bp_sugar3.png differ diff --git a/image/topping_msc/bp_sugar4.png b/image/topping_msc/bp_sugar4.png new file mode 100644 index 00000000..19b8d00e Binary files /dev/null and b/image/topping_msc/bp_sugar4.png differ diff --git a/image/topping_msc/bp_sugar5.png b/image/topping_msc/bp_sugar5.png new file mode 100644 index 00000000..d8fcca13 Binary files /dev/null and b/image/topping_msc/bp_sugar5.png differ diff --git a/image/topping_msc/cb_ch.png b/image/topping_msc/cb_ch.png new file mode 100644 index 00000000..8e632445 Binary files /dev/null and b/image/topping_msc/cb_ch.png differ diff --git a/image/topping_msc/cb_nch.png b/image/topping_msc/cb_nch.png new file mode 100644 index 00000000..e3401d66 Binary files /dev/null and b/image/topping_msc/cb_nch.png differ diff --git a/image/topping_msc/extra_img_1.png b/image/topping_msc/extra_img_1.png new file mode 100644 index 00000000..447eea45 Binary files /dev/null and b/image/topping_msc/extra_img_1.png differ diff --git a/image/topping_msc/img_collagen.png b/image/topping_msc/img_collagen.png new file mode 100644 index 00000000..32553966 Binary files /dev/null and b/image/topping_msc/img_collagen.png differ diff --git a/image/topping_msc/img_ontop_collagen.png b/image/topping_msc/img_ontop_collagen.png new file mode 100644 index 00000000..f0216d7a Binary files /dev/null and b/image/topping_msc/img_ontop_collagen.png differ diff --git a/image/topping_msc/img_ontop_shot.png b/image/topping_msc/img_ontop_shot.png new file mode 100644 index 00000000..0ba2fe30 Binary files /dev/null and b/image/topping_msc/img_ontop_shot.png differ diff --git a/image/topping_msc/img_ontop_shot2.png b/image/topping_msc/img_ontop_shot2.png new file mode 100644 index 00000000..814f229d Binary files /dev/null and b/image/topping_msc/img_ontop_shot2.png differ diff --git a/image/topping_msc/img_ontop_shot_col.png b/image/topping_msc/img_ontop_shot_col.png new file mode 100644 index 00000000..6f2c0ad5 Binary files /dev/null and b/image/topping_msc/img_ontop_shot_col.png differ diff --git a/image/topping_msc/img_recipe.png b/image/topping_msc/img_recipe.png new file mode 100644 index 00000000..58332d15 Binary files /dev/null and b/image/topping_msc/img_recipe.png differ diff --git a/image/topping_msc/img_sugar.png b/image/topping_msc/img_sugar.png new file mode 100644 index 00000000..ef106619 Binary files /dev/null and b/image/topping_msc/img_sugar.png differ diff --git a/image/topping_msc/img_sugar_3_keto.png b/image/topping_msc/img_sugar_3_keto.png new file mode 100644 index 00000000..f0240396 Binary files /dev/null and b/image/topping_msc/img_sugar_3_keto.png differ diff --git a/image/topping_msc/sugar_keto.png b/image/topping_msc/sugar_keto.png new file mode 100644 index 00000000..603d0204 Binary files /dev/null and b/image/topping_msc/sugar_keto.png differ diff --git a/inter/tha/xml/multi/menu_catalog_default_init.lxml b/inter/tha/xml/multi/menu_catalog_default_init.lxml index 0b11c311..ce77dcf9 100644 --- a/inter/tha/xml/multi/menu_catalog_default_init.lxml +++ b/inter/tha/xml/multi/menu_catalog_default_init.lxml @@ -7,6 +7,7 @@ DEBUGVAR LanguageShow DEBUGVAR CountryName + ;inter-image If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -41,7 +42,6 @@ InstanceSetString "ShowMSC" EndIf - ;inter-image If CountryName = "Malaysia" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" @@ -49,8 +49,6 @@ Var ice_tab_text = "Ice will be ready at " EndIf - - ;inter-image If CountryName = "Australia" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" diff --git a/inter/tha/xml/multi/menu_catalog_new_menu.lxml b/inter/tha/xml/multi/menu_catalog_new_menu.lxml index 0aa23984..fcc68d99 100644 --- a/inter/tha/xml/multi/menu_catalog_new_menu.lxml +++ b/inter/tha/xml/multi/menu_catalog_new_menu.lxml @@ -1,4 +1,5 @@ + ;inter-image If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml index 8e56ee1d..bb0dd205 100644 --- a/inter/tha/xml/page_topping_select6.lxml +++ b/inter/tha/xml/page_topping_select6.lxml @@ -594,6 +594,7 @@ EndIf + ;inter-image If LanguageShow = "ENG" Then If show_name_len > 24 Then Var showname = showname + "###size=54" @@ -1097,6 +1098,7 @@ DEBUGVAR LanguageShowByIndex DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 430 @@ -8785,6 +8787,7 @@ DEBUGVAR showname DEBUGVAR showdesc + ;inter-image If LanguageShow = "ENG" Then If show_name_len > 24 Then Var showname = showname + "###size=54" diff --git a/xml/features/alert_sms/page_enter_num.lxml b/xml/features/alert_sms/page_enter_num.lxml index d4962b98..8fc1fe9d 100644 --- a/xml/features/alert_sms/page_enter_num.lxml +++ b/xml/features/alert_sms/page_enter_num.lxml @@ -24,10 +24,15 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collect_point1_msc" + EndIf + Var CurrentAlertName = AlertProductName[LanguageShowByIndex] Var CurrentAlertProductCode = "" @@ -496,10 +501,15 @@ Var DirImage2 = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage2 = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var text_show_error = DirImage2 + "/text_show_error5.png" Var ShowErrorText = "Enable" diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 2934c6bc..15e2611a 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -63,6 +63,7 @@ Var DirImageDoing = "ROOT/taobin_project/image/page_doing_en" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImageDoing = "ROOT/taobin_project/image/page_doing_mmr/" EndIf @@ -136,6 +137,7 @@ Var XStraw = 142 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" @@ -162,8 +164,6 @@ EndIf If LanguageShow = "MSC" Then - ;for test - Var IMG_CNT = DirImageDoing + "/img2_en.png" Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" @@ -243,8 +243,13 @@ EndIf If LanguageShow = "MSC" Then - Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" - Var DirImage2 = "ROOT/taobin_project/image/topping_en" + If CountryName = "HongKong" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping_en" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping_en" + EndIf EndIf diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index 0dc8a3ab..6243b9dd 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -19,14 +19,20 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/topping_mmr" EndIf If LanguageShow = "MSC" Then - Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" - Var DirImage2 = "ROOT/taobin_project/image/topping_en" + If CountryName = "HongKong" Then + Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping_en" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping_en" + EndIf EndIf If LanguageObjectShow = "Enable" Then diff --git a/xml/page_before_check_member.xml b/xml/page_before_check_member.xml index 367f79d0..8788640f 100644 --- a/xml/page_before_check_member.xml +++ b/xml/page_before_check_member.xml @@ -34,11 +34,16 @@ ;EndIf ;EndIf + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -52,6 +57,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" Var text = "Manage your Tao Bin account" @@ -68,6 +74,11 @@ Var text = "သင်၏ Tao Bin အကောင့်ကို စီမံခန့်ခွဲပါ။" Var Extension = "_mmr.png" EndIf + + If LanguageShow = "MSC" Then + Var text = "管理您的 Tao Bin 账户" + Var Extension = "_msc.png" + EndIf SAVELOG "EventLanguageOnChange menu -list" diff --git a/xml/page_board.xml b/xml/page_board.xml index d1712438..52d10575 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1229,7 +1229,7 @@ Var MyanmarLangEnable = "true" - Var CatalogLayoutV3 = 1 + Var CatalogLayoutV3 = 0 ; test payment Var New_Payment = 1 @@ -1255,9 +1255,7 @@ EnableLanguage "ENG" EnableLanguage "THAI" EnableLanguage "MYANMAR" - ;EnableLanguage "MSC" - - + EnableLanguage "MSC" SetLanguage "THAI" LanguageControl "UpdateList" "-" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 985a64e1..b6b69e21 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -341,7 +341,7 @@ EndIf If LanguageShow = "MSC" Then - Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" Var DirImage2 = "ROOT/taobin_project/image/topping_en" EndIf diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 28ef8da2..6d3bdd25 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -37,6 +37,7 @@ ;Var PayCredit = 0 + ;inter-image If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/topping2_en" @@ -53,6 +54,11 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping_msc" + EndIf + If LanguageObjectShow = "Enable" Then Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/" Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png" diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index fb7f3550..a10b6961 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -31,12 +31,16 @@ EndIf EndIf - + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -202,6 +206,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then ;Var CheckMemberTitle = CheckMemberTitleEN @@ -231,6 +236,10 @@ Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then diff --git a/xml/page_check_member1.xml b/xml/page_check_member1.xml index 59b25dea..697ffadd 100644 --- a/xml/page_check_member1.xml +++ b/xml/page_check_member1.xml @@ -51,10 +51,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var Ext1a = "" diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index fe502b8e..8591bc23 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -23,11 +23,16 @@ Var Timeout = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -193,6 +198,16 @@ Var text5Img = "/text5.png" + ;inter-image + If LanguageShow = "MSC" Then + Var text5Img = "/text5-MSC.png" + EndIf + + ;inter-image + If LanguageShow = "MYANMAR" Then + Var text5Img = "/text5-MMR.png" + EndIf + ;inter-image If CountryName = "Malaysia" Then Var text5Img = "/text5-MYR.png" @@ -224,6 +239,7 @@ Var text5Img = "/text5.png" + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/display_point_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" @@ -1348,6 +1364,381 @@ EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc" + Var text5Img = "/text5-MSC.png" + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "升级至飞行乌龟！" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "飞行乌龟 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "晋级至龟中大师" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "龟中大师 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + + If CouponIDA = "" Then + Else + + + Var CouponSTA = "Enable" + Var CouponExireA_D = "" + Var CouponExireA_M = "" + Var CouponExireA_Y = "" + Var CouponTypeA = "" + Var CouponNameA = "" + + + SPLIT CouponInfoA "/" 2 CouponTypeA + SPLIT CouponInfoA "/" 4 CouponExireA_D + SPLIT CouponInfoA "/" 5 CouponExireA_M + SPLIT CouponInfoA "/" 6 CouponExireA_Y + + + If CouponTypeA = "100" Then + Var CouponNameA = "/imgCouponC33.png" + EndIf + If CouponTypeA = "101" Then + Var CouponNameA = "/imgCouponC44.png" + EndIf + If CouponTypeA = "102" Then + Var CouponNameA = "/imgCouponC39.png" + EndIf + If CouponTypeA = "103" Then + Var CouponNameA = "/imgCouponC40.png" + EndIf + If CouponTypeA = "105" Then + Var CouponNameA = "/imgCouponC38.png" + EndIf + If CouponTypeA = "106" Then + Var CouponNameA = "/imgCouponC41.png" + EndIf + If CouponTypeA = "107" Then + Var CouponNameA = "/imgCouponC42.png" + EndIf + If CouponTypeA = "109" Then + Var CouponNameA = "/imgCouponC33.png" + EndIf + If CouponTypeA = "112" Then + Var CouponNameA = "/imgCoupon112.png" + EndIf + If CouponTypeA = "113" Then + Var CouponNameA = "/imgCoupon113.png" + EndIf + + If CouponTypeA = "120" Then + Var CouponNameA = "/imgCoupon120.png" + EndIf + If CouponTypeA = "121" Then + Var CouponNameA = "/imgCoupon121.png" + EndIf + + If CouponTypeA = "135" Then + Var CouponNameA = "/imgCouponMKP1.png" + EndIf + + INT CouponExireA_D + INT CouponExireA_Y + Var CouponExireA_Y = CouponExireA_Y + 0 + + If CouponExireA_M = "01" Then + Var CouponExireA_M = "一月" + EndIf + + If CouponExireA_M = "02" Then + Var CouponExireA_M = "二月" + EndIf + + If CouponExireA_M = "03" Then + Var CouponExireA_M = "三月" + EndIf + + If CouponExireA_M = "04" Then + Var CouponExireA_M = "四月" + EndIf + + If CouponExireA_M = "05" Then + Var CouponExireA_M = "五月" + EndIf + + If CouponExireA_M = "06" Then + Var CouponExireA_M = "六月" + EndIf + + If CouponExireA_M = "07" Then + Var CouponExireA_M = "七月" + EndIf + + If CouponExireA_M = "08" Then + Var CouponExireA_M = "八月" + EndIf + + If CouponExireA_M = "09" Then + Var CouponExireA_M = "九月" + EndIf + + If CouponExireA_M = "10" Then + Var CouponExireA_M = "十月" + EndIf + + If CouponExireA_M = "11" Then + Var CouponExireA_M = "十一月" + EndIf + + If CouponExireA_M = "12" Then + Var CouponExireA_M = "十二月" + EndIf + + Var CouponExpireA = "" + Var CouponExpireA = CouponExpireA + CouponExireA_D + Var CouponExpireA = CouponExpireA + " " + Var CouponExpireA = CouponExpireA + CouponExireA_M + Var CouponExpireA = CouponExpireA + " " + Var CouponExpireA = CouponExpireA + CouponExireA_Y + + Var CouponExpireA = CouponExpireA + " 天后过期" + Var CouponExpireAPosittion = 1375 + + EndIf + + If CouponIDB = "" Then + Else + + + Var CouponSTB = "Enable" + Var CouponExireB_D = "" + Var CouponExireB_M = "" + Var CouponExireB_Y = "" + Var CouponTypeB = "" + Var CouponNameB = "" + + SPLIT CouponInfoB "/" 2 CouponTypeB + SPLIT CouponInfoB "/" 4 CouponExireB_D + SPLIT CouponInfoB "/" 5 CouponExireB_M + SPLIT CouponInfoB "/" 6 CouponExireB_Y + + + If CouponTypeB = "100" Then + Var CouponNameB = "/imgCouponC33.png" + EndIf + If CouponTypeB = "101" Then + Var CouponNameB = "/imgCouponC44.png" + EndIf + If CouponTypeB = "102" Then + Var CouponNameB = "/imgCouponC39.png" + EndIf + If CouponTypeB = "103" Then + Var CouponNameB = "/imgCouponC40.png" + EndIf + If CouponTypeB = "105" Then + Var CouponNameB = "/imgCouponC38.png" + EndIf + If CouponTypeB = "106" Then + Var CouponNameB = "/imgCouponC41.png" + EndIf + If CouponTypeB = "107" Then + Var CouponNameB = "/imgCouponC42.png" + EndIf + If CouponTypeB = "109" Then + Var CouponNameB = "/imgCouponC33.png" + EndIf + If CouponTypeB = "112" Then + Var CouponNameB = "/imgCoupon112.png" + EndIf + If CouponTypeB = "113" Then + Var CouponNameB = "/imgCoupon113.png" + EndIf + + If CouponTypeB = "120" Then + Var CouponNameB = "/imgCoupon120.png" + EndIf + If CouponTypeB = "121" Then + Var CouponNameB = "/imgCoupon121.png" + EndIf + + If CouponTypeB = "135" Then + Var CouponNameB = "/imgCouponMKP1.png" + EndIf + + INT CouponExireB_D + INT CouponExireB_Y + Var CouponExireB_Y = CouponExireB_Y + 0 + + If CouponExireB_M = "01" Then + Var CouponExireB_M = "一月" + EndIf + + If CouponExireB_M = "02" Then + Var CouponExireB_M = "二月" + EndIf + + If CouponExireB_M = "03" Then + Var CouponExireB_M = "三月" + EndIf + + If CouponExireB_M = "04" Then + Var CouponExireB_M = "四月" + EndIf + + If CouponExireB_M = "05" Then + Var CouponExireB_M = "五月" + EndIf + + If CouponExireB_M = "06" Then + Var CouponExireB_M = "六月" + EndIf + + If CouponExireB_M = "07" Then + Var CouponExireB_M = "七月" + EndIf + + If CouponExireB_M = "08" Then + Var CouponExireB_M = "八月" + EndIf + + If CouponExireB_M = "09" Then + Var CouponExireB_M = "九月" + EndIf + + If CouponExireB_M = "10" Then + Var CouponExireB_M = "十月" + EndIf + + If CouponExireB_M = "11" Then + Var CouponExireB_M = "十一月" + EndIf + + If CouponExireB_M = "12" Then + Var CouponExireB_M = "十二月" + EndIf + + Var CouponExpireB = "" + Var CouponExpireB = CouponExpireB + CouponExireB_D + Var CouponExpireB = CouponExpireB + " " + Var CouponExpireB = CouponExpireB + CouponExireB_M + Var CouponExpireB = CouponExpireB + " " + Var CouponExpireB = CouponExpireB + CouponExireB_Y + + Var CouponExpireB = CouponExpireB + " 天后过期" + + + EndIf + + Var CouponText = "优惠券 (" + CouponNum + Var CouponText = CouponText + ")" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then diff --git a/xml/page_check_member2_campaign.xml b/xml/page_check_member2_campaign.xml index 898dc8a7..3f4689a2 100644 --- a/xml/page_check_member2_campaign.xml +++ b/xml/page_check_member2_campaign.xml @@ -11,15 +11,20 @@ page_check_member2_campaign Var Timeout = 0 + ;inter-multi If show_eng = "true" Then - If LanguageShow = "MYANMAR" Then - SetLanguage "MYANMAR" - Else - SetLanguage "ENG" - EndIf - Else - SetLanguage "THAI" - EndIf + If LanguageShow = "MYANMAR" Then + SetLanguage "MYANMAR" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf + EndIf + Else + SetLanguage "THAI" + EndIf Var CoffeePointRank = CoffeePointRankTmp ;Var PointDiff = 150 - CoffeePointRank @@ -911,6 +916,179 @@ page_check_member2_campaign Var dayDiff_Y = 1154 Var dayDiff_Size = 16 EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc" + Var DirImageCampaign = "ROOT/taobin_project/image/display_point_campaign_msc" + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "升级至飞行乌龟！" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "飞行乌龟 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "晋级至龟中大师" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "龟中大师 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + + Var Months[0] = "一月" + Var Months[1] = "二月" + Var Months[2] = "三月" + Var Months[3] = "四月" + Var Months[4] = "五月" + Var Months[5] = "六月" + Var Months[6] = "七月" + Var Months[7] = "八月" + Var Months[8] = "九月" + Var Months[9] = "十月" + Var Months[10] = "十一月" + Var Months[11] = "十二月" + + If CouponIDA = "" Then + Else + + Var MonthIndex = CouponExireA_M + INT MonthIndex + Var MonthIndex = MonthIndex - 1 + Var CouponExireA_M = Months[MonthIndex] + + Var CouponExpireA = CouponExpireA + " 过期" + EndIf + + If CouponIDB = "" Then + Else + + Var MonthIndex = CouponExireB_M + INT MonthIndex + Var MonthIndex = MonthIndex - 1 + Var CouponExireB_M = Months[MonthIndex] + + Var CouponExpireB = CouponExpireB + " 过期" + + EndIf + + Var CouponText = "优惠券 (" + CouponNum + Var CouponText = CouponText + ")" + + Var MemberText = "会员等级" + Var CreditTotalLabel = "总信用额度" + Var ShellTotalLabel = "贝壳总余额" + Var CreditUnit = "泰铢" + Var ShellUnit = "SHELLS" + Var dayDiff_X = 170 + Var dayDiff_Y = 1154 + Var dayDiff_Size = 16 + EndIf SAVELOG "EventLanguageOnChange menu -list" @@ -1261,6 +1439,9 @@ page_check_member2_campaign If LanguageShow = "MYANMAR" Then Var return = "သင်သည် Lucky Draw ဆုလာဘ်ကို ရရှိပြီးဖြစ်သည်။" EndIf + If LanguageShow = "MSC" Then + Var return = "您已经获得过抽奖奖励。" + EndIf ) diff --git a/xml/page_check_member3.xml b/xml/page_check_member3.xml index 44f8c4c1..f7c855d2 100644 --- a/xml/page_check_member3.xml +++ b/xml/page_check_member3.xml @@ -29,9 +29,14 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc" + EndIf diff --git a/xml/page_check_member_point.xml b/xml/page_check_member_point.xml index 88032d6b..d905fd68 100644 --- a/xml/page_check_member_point.xml +++ b/xml/page_check_member_point.xml @@ -37,10 +37,15 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc" + EndIf + RootLayoutVisible 3 "hide" Var CoffeePointTmp = CoffeePoint @@ -280,6 +285,72 @@ Var TaobinExpireYear = TaobinExpireYear + 0 EndIf + If LanguageShow = "MSC" Then + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + EndIf Var ExpireStrTmp = "" Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay @@ -487,6 +558,68 @@ EndIf EndIf + If LanguageShow = "MSC" Then + Var TaobinLevelDesc3 = TaobinCoupons + Var TaobinLevelDesc3 = "您有" + TaobinLevelDesc3 + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " 张可用优惠券。" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "升级至飞行乌龟！" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "飞行乌龟 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "晋级至龟中大师" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "龟中大师 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + EndIf + Var taobinP1 = "Invisible" Var taobinP2 = "Invisible" @@ -782,6 +915,7 @@ Var xPointEndDate = 485 Var yPointEndDate = 1570 Var xDescEndDate = 172 + Var TaobinLevelDesc3X = 380 If show_eng = "true" Then Var xPointEndDate = 566 @@ -794,6 +928,12 @@ Var xDescEndDate = 265 EndIf + If LanguageShow = "MSC" Then + Var xPointEndDate = 420 + Var yPointEndDate = 1563 + Var TaobinLevelDesc3X = 430 + EndIf + 1000 @@ -1281,7 +1421,7 @@ - 380 + TaobinLevelDesc3X 1621 25 1000 diff --git a/xml/page_check_newmember1.xml b/xml/page_check_newmember1.xml index 642310f4..ad152906 100644 --- a/xml/page_check_newmember1.xml +++ b/xml/page_check_newmember1.xml @@ -47,10 +47,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var Ext1a = "" diff --git a/xml/page_check_newmember2.xml b/xml/page_check_newmember2.xml index 0a92d8fe..f2f18a5a 100644 --- a/xml/page_check_newmember2.xml +++ b/xml/page_check_newmember2.xml @@ -47,10 +47,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var Ext1a = "ok" diff --git a/xml/page_clean_feedback.xml b/xml/page_clean_feedback.xml index 9f474eb9..5d0fcdc7 100644 --- a/xml/page_clean_feedback.xml +++ b/xml/page_clean_feedback.xml @@ -45,6 +45,7 @@ Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_en.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var PopupTitle = "စက်သန့်ရှင်းမှု အမှတ်" Var Description = "ကျွန်တော်တို့ နေ့စဉ် တိုးတက်ချင်လို့ပါ။" @@ -64,6 +65,24 @@ EndIf + If LanguageShow = "MSC" Then + Var PopupTitle = "机器清洁度评分" + Var Description = "请帮助我们评估！我们每天都想进步" + + Var TitleSize = 55 + + Var FeedbackLevel[0] = DirImage + "bn_feedback_level_1_msc.png" + Var FeedbackLevel[0].Pressed = DirImage + "bp_feedback_level_1_msc.png" + Var FeedbackLevel[1] = DirImage + "bn_feedback_level_2_msc.png" + Var FeedbackLevel[1].Pressed = DirImage + "bp_feedback_level_2_msc.png" + Var FeedbackLevel[2] = DirImage + "bn_feedback_level_3_msc.png" + Var FeedbackLevel[2].Pressed = DirImage + "bp_feedback_level_3_msc.png" + Var FeedbackLevel[3] = DirImage + "bn_feedback_level_4_msc.png" + Var FeedbackLevel[3].Pressed = DirImage + "bp_feedback_level_4_msc.png" + Var FeedbackLevel[4] = DirImage + "bn_feedback_level_5_msc.png" + Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_msc.png" + EndIf + 1000 diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index eeb5740c..67fab720 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -65,10 +65,15 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collect_point1_msc" + EndIf + If InternationalEnable = 1 Then If LanguageShow = "UAE_DUBAI" Then Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png" @@ -683,10 +688,15 @@ Var DirImage2 = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage2 = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var text_show_error = DirImage2 + "/text_show_error5.png" Var ShowErrorText = "Enable" diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index ec9cca19..8ffb3a9a 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -44,10 +44,15 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + If PayOfflineMode = 1 Then Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = ParamCP diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 7dee9069..da2f4e78 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -52,12 +52,19 @@ Var TextEndDateY = 1570 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr" Var TaobinLevelDesc3X = 380 Var TextEndDateY = 1580 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc" + Var TaobinLevelDesc3X = 380 + Var TextEndDateY = 1570 + EndIf + If LanguageObjectShow = "Enable" Then Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/" Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png" @@ -308,6 +315,72 @@ Var TaobinExpireYear = TaobinExpireYear + 0 EndIf + If LanguageShow = "MSC" Then + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + EndIf Var ExpireStrTmp = "" Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay @@ -516,6 +589,67 @@ EndIf EndIf + If LanguageShow = "MSC" Then + Var TaobinLevelDesc3 = TaobinCoupons + Var TaobinLevelDesc3 = "您有" + TaobinLevelDesc3 + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " 张可用优惠券。" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "升级至飞行乌龟！" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "晋级至龟中大师" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + EndIf Var CheckCoupons = 0 @@ -784,11 +918,16 @@ Var xPointEndDate = 618 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var xPointEndDate = 490 Var TextEndDateX = 190 EndIf + If LanguageShow = "MSC" Then + Var xPointEndDate = 618 + EndIf + Var Point2XState = "Invisible" Var Point2XImage = "" If Point2X = 1 Then diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index ca6272db..90c4acd4 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -41,11 +41,17 @@ Var TextEndDateY = 1570 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr/" Var TextEndDateY = 1570 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc/" + Var TextEndDateY = 1570 + EndIf + If LanguageObjectShow = "Enable" Then Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/" Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png" @@ -288,6 +294,72 @@ Var TaobinExpireYear = TaobinExpireYear + 0 EndIf + If LanguageShow = "MSC" Then + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + EndIf Var ExpireStrTmp = "" Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay @@ -495,6 +567,67 @@ EndIf EndIf + If LanguageShow = "MSC" Then + Var TaobinLevelDesc3 = TaobinCoupons + Var TaobinLevelDesc3 = "您有" + TaobinLevelDesc3 + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " 张可用优惠券。" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "升级至飞行乌龟！" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "晋级至龟中大师" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf + EndIf @@ -795,18 +928,26 @@ Var xPointEndDate = 490 Var yPointEndDate = 1570 Var xDescEndDate = 172 + Var TaobinLevelDesc3X = 380 If show_eng = "true" Then Var xPointEndDate = 575 Var yPointEndDate = 1563 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var xPointEndDate = 520 Var yPointEndDate = 1568 Var xDescEndDate = 265 EndIf + If LanguageShow = "MSC" Then + Var xPointEndDate = 420 + Var yPointEndDate = 1563 + Var TaobinLevelDesc3X = 410 + EndIf + Var FlagForProtectXMLOpenDouble = 0 @@ -1329,7 +1470,7 @@ - 380 + TaobinLevelDesc3X 1621 25 1000 diff --git a/xml/page_collect_point_3_28_lucky_draw_campaign.xml b/xml/page_collect_point_3_28_lucky_draw_campaign.xml index 943f38b5..26293820 100644 --- a/xml/page_collect_point_3_28_lucky_draw_campaign.xml +++ b/xml/page_collect_point_3_28_lucky_draw_campaign.xml @@ -43,11 +43,17 @@ Var TextEndDateY = 1570 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr/" Var TextEndDateY = 1580 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_point_msc/" + Var TextEndDateY = 1570 + EndIf + If LanguageObjectShow = "Enable" Then Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/" Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png" @@ -290,6 +296,73 @@ Var TaobinExpireYear = TaobinExpireYear + 0 EndIf + If LanguageShow = "MSC" Then + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "1月" + Var TaobinExpireMonthX = "一月" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "2月" + Var TaobinExpireMonthX = "二月" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "3月" + Var TaobinExpireMonthX = "三月" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "4月" + Var TaobinExpireMonthX = "四月" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "5月" + Var TaobinExpireMonthX = "五月" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "6月" + Var TaobinExpireMonthX = "六月" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "7月" + Var TaobinExpireMonthX = "七月" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "8月" + Var TaobinExpireMonthX = "八月" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "9月" + Var TaobinExpireMonthX = "九月" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "10月" + Var TaobinExpireMonthX = "十月" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "11月" + Var TaobinExpireMonthX = "十一月" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "12月" + Var TaobinExpireMonthX = "十二月" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + EndIf + Var ExpireStrTmp = "" Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay @@ -500,6 +573,70 @@ EndIf EndIf + If LanguageShow = "MSC" Then + Var TaobinLevelDesc3 = TaobinCoupons + Var TaobinLevelDesc3 = "您有" + TaobinLevelDesc3 + Var TaobinLevelDesc3 = TaobinLevelDesc3 + " 张可用优惠券。" + + If TaobinLevel = "1" Then + Var TaobinLevelDesc1 = "害羞龟" + Var TaobinLevelDesc2 = "" + Var CurrentLevel = "害羞龟" + Var TaobinLeveImg = "/level1.png" + EndIf + + If TaobinLevel = "2" Then + Var TaobinLevelDesc1 = "行走的乌龟" + Var PointDiff = 150 - CoffeePointRank + Var TaobinLevelDesc2 = "赚取 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "\n升级至飞行乌龟！" + Var CurrentLevel = "行走的乌龟" + Var TaobinLeveImg = "/level2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "飞行乌龟 " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "飞行乌龟持续至 " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "通过 " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " 获取 " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "个 shells, " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "\n晋级至龟中大师！" + Var CurrentLevel = "飞行乌龟" + Var TaobinLeveImg = "/level3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc2 = "" + ;Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "龟中大师持续至 " + ExpireStrTmp + Var CurrentLevel = "龟中大师持续至" + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/level4.png" + EndIf + EndIf + Var MakeDrinkState = 0 @@ -797,14 +934,24 @@ DEBUGVAR PointEndDate Var xPointEndDate = 490 Var yPointEndDate = 1570 + Var xDescEndDate = 172 + Var TaobinLevelDesc3X = 380 If show_eng = "true" Then Var xPointEndDate = 575 Var yPointEndDate = 1563 EndIf + + ;inter-image If LanguageShow = "MYANMAR" Then Var xPointEndDate = 520 Var yPointEndDate = 1578 + Var xDescEndDate = 265 + EndIf + If LanguageShow = "MSC" Then + Var xPointEndDate = 420 + Var yPointEndDate = 1563 + Var TaobinLevelDesc3X = 410 EndIf Var LuckyDrawTicketFormat = "%03.0f" @@ -1068,12 +1215,18 @@ eval( If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var return = "ကံထူးရန်" + dayDiff Var return = return + " ရက်သာ လိုတော့သည်" Else - Var return = "" + dayDiff - Var return = return + " days left to WIN a chance!" + If LanguageShow = "MSC" Then + Var return = "" + dayDiff + Var return = return + " 天剩余" + Else + Var return = "" + dayDiff + Var return = return + " days left to WIN a chance!" + EndIf EndIf Else Var return = "เหลืออีก " + dayDiff @@ -1093,10 +1246,15 @@ eval( If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var return = "များများဝယ်ပါ၊ များများအနိုင်ရပါ။ Tesla က စောင့်မျှော်နေပါတယ်။" Else - Var return = "Buy more, WIN more! Tesla await!" + If LanguageShow = "MSC" Then + Var return = "买得越多，赢得越多！Tesla 等你来赢！" + Else + Var return = "Buy more, WIN more! Tesla await!" + EndIf EndIf Else Var return = "ยิ่งดื่ม ยิ่งมีโชค ยิ่งได้ลุ้น! Tesla รออยู่!" @@ -1130,10 +1288,15 @@ eval( If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var return = "အဖွဲ့ဝင်အခြေအနေ" Else - Var return = "MEMBERSHIP STATUS" + If LanguageShow = "MSC" Then + Var return = "会员状态" + Else + Var return = "MEMBERSHIP STATUS" + EndIf EndIf Else Var return = "สถานะสมาชิก" @@ -1160,10 +1323,15 @@ eval( If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var return = "စုစုပေါင်း Shell လက်ကျန်:" Else - Var return = "TOTAL SHELL BALANCE:" + If LanguageShow = "MSC" Then + Var return = "总贝壳余额：" + Else + Var return = "TOTAL SHELL BALANCE:" + EndIf EndIf Else Var return = "ยอดกระดองสะสม:" @@ -1499,7 +1667,7 @@ - 380 + TaobinLevelDesc3X 1621 25 1000 diff --git a/xml/page_collect_point_error.xml b/xml/page_collect_point_error.xml index fac06a80..b1e23f13 100644 --- a/xml/page_collect_point_error.xml +++ b/xml/page_collect_point_error.xml @@ -31,9 +31,14 @@ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_mmr/" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_get_free_msc/" + EndIf 1000 diff --git a/xml/page_display_get_15_discount.xml b/xml/page_display_get_15_discount.xml index 8906d878..2ba4544b 100644 --- a/xml/page_display_get_15_discount.xml +++ b/xml/page_display_get_15_discount.xml @@ -14,10 +14,15 @@ Var DirImage = "ROOT/taobin_project/image/display_get_discount" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_get_discount_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_get_discount_msc" + EndIf + Var PopUpState1 = "Invisible" Var PopUpState2 = "Enable" Var PopUpErrorState = "Invisible" diff --git a/xml/page_display_get_drink_5_baht.xml b/xml/page_display_get_drink_5_baht.xml index 6b149ac8..06cad0ff 100644 --- a/xml/page_display_get_drink_5_baht.xml +++ b/xml/page_display_get_drink_5_baht.xml @@ -14,10 +14,15 @@ Var DirImage = "ROOT/taobin_project/image/display_get_discount" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_get_discount_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_get_discount_msc" + EndIf + Var PopUpState1 = "Enable" Var PopUpState2 = "Invisible" Var PopUpErrorState = "Invisible" diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 319998f0..d8ecf352 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -24,9 +24,14 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_get_free_msc" + EndIf Var MemberState1 = "Enable" diff --git a/xml/page_disqualified_idcard.xml b/xml/page_disqualified_idcard.xml index cede13e2..4b51cfe9 100644 --- a/xml/page_disqualified_idcard.xml +++ b/xml/page_disqualified_idcard.xml @@ -17,9 +17,14 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_disqualified_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_disqualified_msc" + EndIf 1000 diff --git a/xml/page_drinkfail2-2.xml b/xml/page_drinkfail2-2.xml index fcb05546..f841b362 100644 --- a/xml/page_drinkfail2-2.xml +++ b/xml/page_drinkfail2-2.xml @@ -17,10 +17,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Timeout = 0 StopLongPlay diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 45964a4d..539c0168 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -118,10 +118,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Timeout = 0 diff --git a/xml/page_drinkfail3.xml b/xml/page_drinkfail3.xml index 8e66effe..dc744a3a 100644 --- a/xml/page_drinkfail3.xml +++ b/xml/page_drinkfail3.xml @@ -17,10 +17,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Timeout = 0 diff --git a/xml/page_drinkfail4.xml b/xml/page_drinkfail4.xml index 92b3e3b6..87d17977 100644 --- a/xml/page_drinkfail4.xml +++ b/xml/page_drinkfail4.xml @@ -17,10 +17,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf Var Timeout = 0 Var GetFreeFlag = 0 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index d7f24590..12fa362b 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -28,8 +28,13 @@ Var DirImage2 = "ROOT/taobin_project/image/topping2" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then - Var DirImage2 = "ROOT/taobin_project/image/topping_mmr" + Var DirImage2 = "ROOT/taobin_project/image/topping_mmr" + EndIf + + If LanguageShow = "MSC" Then + Var DirImage2 = "ROOT/taobin_project/image/topping_msc" EndIf Var bg_strawlid_ST = "Enable" @@ -143,9 +148,14 @@ If show_eng = "true" Then + ;inter-image If LanguageShow = "MYANMAR" Then Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_mmr.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_mmr.png" + EndIf + If LanguageShow = "MSC" Then + Var bnStrawProblemReport = "ROOT/taobin_project/inter/hkg/image/page_doing/bn_send_report_straw_msc.png" + Var bpStrawProblemReport = "ROOT/taobin_project/inter/hkg/image/page_doing/bp_send_report_straw_msc.png" Else Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index 833baa9e..77b2aafd 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -54,6 +54,7 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then If CountryName = "Singapore" Then @@ -67,6 +68,20 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" EndIf + ;inter-image + If LanguageShow = "MSC" Then + + If CountryName = "Singapore" Then + Var show_btp = "" + Var show_btn = "" + + EndIf + + + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc" + EndIf + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3" Else @@ -75,11 +90,16 @@ Var imgGetChange = "/imgGetChange.png" - ;inter-th-mmr + ;inter-image If LanguageShow = "MYANMAR" Then Var imgGetChange = "/imgGetChange-MMR.png" EndIf + ;inter-image + If LanguageShow = "MSC" Then + Var imgGetChange = "/imgGetChange-MSC.png" + EndIf + ;inter-image If CountryName = "Malaysia" Then Var imgGetChange = "/imgGetChange-MYR.png" diff --git a/xml/page_got_free_idcard.xml b/xml/page_got_free_idcard.xml index 2ee2ad59..12420a1d 100644 --- a/xml/page_got_free_idcard.xml +++ b/xml/page_got_free_idcard.xml @@ -17,9 +17,14 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_got_free_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/display_got_free_msc" + EndIf 1000 diff --git a/xml/page_identity18_verification.xml b/xml/page_identity18_verification.xml index 50d89e11..c6284b6e 100644 --- a/xml/page_identity18_verification.xml +++ b/xml/page_identity18_verification.xml @@ -47,12 +47,18 @@ ins Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + If CameraCount = 1 Then diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 5618fb98..3effac7d 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -105,12 +105,18 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + If CameraCount = 1 Then diff --git a/xml/page_member_topup3.xml b/xml/page_member_topup3.xml index 315657b9..e0ad07f2 100644 --- a/xml/page_member_topup3.xml +++ b/xml/page_member_topup3.xml @@ -15,11 +15,16 @@ Var SumCreditAmount = TaobinCredit + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -57,6 +62,11 @@ Var text_4 = "/text_4-MMR.png" EndIf + ;inter-image + If LanguageShow = "MSC" Then + Var text_4 = "/text_4-MSC.png" + EndIf + INT TaobinCredit Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow ) @@ -67,6 +77,7 @@ DEBUGVAR LanguageShow DEBUGVAR InternationalEnable + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -86,6 +97,10 @@ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf SAVELOG "EventLanguageOnChange menu -list" diff --git a/xml/page_member_topupAmount.xml b/xml/page_member_topupAmount.xml index 58394c70..a1484331 100644 --- a/xml/page_member_topupAmount.xml +++ b/xml/page_member_topupAmount.xml @@ -22,11 +22,16 @@ Var GetCreditFlag = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -76,6 +81,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" @@ -91,6 +97,11 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then @@ -148,10 +159,15 @@ If GetPayInfoFlag = 1 Then Var QRCODE99 = "" If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "QR ကို အသုံးမပြုနိုင်ပါ၊ ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။" Else - Var TextWaiting = "Unable to use QR, please try again later." + If LanguageShow = "MSC" Then + Var TextWaiting = "无法使用二维码，请稍后再试。" + Else + Var TextWaiting = "Unable to use QR, please try again later." + EndIf EndIf Else Var TextWaiting = "ระบบ QR ขัดข้อง โปรดใช้ใหม่ภายหลัง." @@ -624,10 +640,13 @@ Else Var TextWaiting = "กรุณารอซักครู่..." EndIf - + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "ခဏစောင့်ပါ။..." EndIf + If LanguageShow = "MSC" Then + Var TextWaiting = "请稍等..." + EndIf Refresh diff --git a/xml/page_member_topupCash.xml b/xml/page_member_topupCash.xml index a7d96f02..07562de1 100644 --- a/xml/page_member_topupCash.xml +++ b/xml/page_member_topupCash.xml @@ -15,16 +15,21 @@ Var SumCreditAmount = TaobinCredit - + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" EndIf + RootLayoutVisible 3 "hide" Var PayState1 = "Enable" @@ -59,15 +64,19 @@ Var RemainAmountStr = "ငွေဖြည့် " + RemainAmountStr Var RemainAmountStr = RemainAmountStr + "###size=90" Else - Var RemainAmountStr = "Top-up " + RemainAmountStr - Var RemainAmountStr = RemainAmountStr + "###size=110" - EndIf + If LanguageShow = "MSC" Then + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "Top-up " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + EndIf + EndIf Else Var RemainAmountStr = "เติม " + RemainAmountStr - Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr = RemainAmountStr + "###size=110" EndIf - Var CoinInFlag = 0 Var CoinInOK = 0 Var ChangeOK = 0 @@ -89,12 +98,11 @@ Var SuggestID = "" - - DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -116,7 +124,11 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" + EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" EndIf SAVELOG "EventLanguageOnChange menu -list" @@ -137,7 +149,6 @@ 1000 - Var Timeout = Timeout + 1 If Timeout > 180 Then If CoinInOK = 0 Then @@ -148,10 +159,15 @@ Var CancelFlag = 1 Var CancelCounter = 0 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" Else - Var RemainAmountStr = "Cancelled" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "已取消" + Else + Var RemainAmountStr = "Cancelled" + EndIf EndIf Else Var RemainAmountStr = "ยกเลิก" @@ -160,10 +176,15 @@ Var CoinInOK = 1 Var CoinInCounter = 0 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Else - Var RemainAmountStr = "Keep credit" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "保存余额" + Else + Var RemainAmountStr = "Keep credit" + EndIf EndIf Else Var RemainAmountStr = "เก็บเครดิต" @@ -291,8 +312,13 @@ Var RemainAmountStr = "ငွေဖြည့် " + RemainAmountStr Var RemainAmountStr = RemainAmountStr + "###size=90" Else - Var RemainAmountStr = "Top-up " + RemainAmountStr - Var RemainAmountStr = RemainAmountStr + "###size=90" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "Top-up " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + EndIf EndIf Else Var RemainAmountStr = "เติม " + RemainAmountStr @@ -303,19 +329,21 @@ If CoinInOK = 0 Then - + Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) If show_eng = "true" Then If LanguageShow = "MYANMAR" Then - Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) Var RemainAmountStr = "ငွေဖြည့် " + RemainAmountStr Var RemainAmountStr = RemainAmountStr + "###size=90" Else - Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) - Var RemainAmountStr = "Top-up " + RemainAmountStr - Var RemainAmountStr = RemainAmountStr + "###size=90" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + Else + Var RemainAmountStr = "Top-up " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=90" + EndIf EndIf Else - Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) Var RemainAmountStr = "เติม " + RemainAmountStr Var RemainAmountStr = RemainAmountStr + "###size=110" EndIf @@ -346,10 +374,15 @@ Var CancelFlag = 1 Var CancelCounter = 0 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" Else - Var RemainAmountStr = "Cancelled" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "已取消" + Else + Var RemainAmountStr = "Cancelled" + EndIf EndIf Else Var RemainAmountStr = "ยกเลิก" @@ -357,10 +390,15 @@ Else Var ChangeOK = 1 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Else - Var RemainAmountStr = "Keep credit" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "保存余额" + Else + Var RemainAmountStr = "Keep credit" + EndIf EndIf Else Var RemainAmountStr = "เก็บเครดิต" @@ -514,10 +552,15 @@ Var CancelCounter = 0 Var CancelFlag = 1 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" Else - Var RemainAmountStr = "Cancelled" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "已取消" + Else + Var RemainAmountStr = "Cancelled" + EndIf EndIf Else Var RemainAmountStr = "ยกเลิก" @@ -525,10 +568,15 @@ Else Var ChangeOK = 1 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Else - Var RemainAmountStr = "Keep credit" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "保存余额" + Else + Var RemainAmountStr = "Keep credit" + EndIf EndIf Else Var RemainAmountStr = "เก็บเครดิต" diff --git a/xml/page_member_topupCode.xml b/xml/page_member_topupCode.xml index c4f2defd..502eb046 100644 --- a/xml/page_member_topupCode.xml +++ b/xml/page_member_topupCode.xml @@ -38,11 +38,17 @@ Var ShowErrorTextY = 935 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" Var ShowErrorTextY = 925 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + Var ShowErrorTextY = 935 + EndIf + RootLayoutVisible 3 "hide" Var CouponNumber = "" diff --git a/xml/page_member_topupQR.xml b/xml/page_member_topupQR.xml index 602f7a54..77b5a700 100644 --- a/xml/page_member_topupQR.xml +++ b/xml/page_member_topupQR.xml @@ -17,12 +17,16 @@ - + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -57,6 +61,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -79,6 +84,11 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then diff --git a/xml/page_member_topupSuccess.xml b/xml/page_member_topupSuccess.xml index 8ad73239..06b6daca 100644 --- a/xml/page_member_topupSuccess.xml +++ b/xml/page_member_topupSuccess.xml @@ -50,6 +50,11 @@ If LanguageShow = "MYANMAR" Then Var text_4 = "/text_4-MMR.png" EndIf + + ;inter-image + If LanguageShow = "MSC" Then + Var text_4 = "/text_4-MSC.png" + EndIf @@ -65,11 +70,17 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + If show_eng = "true" Then Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -89,6 +100,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -106,9 +118,13 @@ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" ;inter-image - If LanguageShow = "MYANMAR" Then - Var text_4 = "/text_4-MMR.png" - EndIf + Var text_4 = "/text_4-MMR.png" + EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + Var text_4 = "/text_4-MSC.png" EndIf SAVELOG "EventLanguageOnChange menu -list" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index eb37209a..1d07ad57 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -374,7 +374,7 @@ Var showRemaining = RemainAmountStr + " Bath" EndIf If LanguageShow = "MSC" Then - Var showRemaining = RemainAmountStr + " Bath" + Var showRemaining = RemainAmountStr + " 泰铢" EndIf EndIf @@ -3681,6 +3681,12 @@ eval( + + + Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + + + diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 2dfafe7e..27c47c75 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -197,11 +197,17 @@ EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bp_cash.png" EndIf + If LanguageShow = "MSC" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_msc/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_msc/page_payment/bp_cash.png" + EndIf + Var X_CASH = 60 If RoadShow = "true" Then @@ -214,10 +220,15 @@ Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bn_cash_2.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bp_cash_2.png" EndIf + If LanguageShow = "MSC" Then + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_msc/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_msc/page_payment/bp_cash_2.png" + EndIf EndIf If GetFreeFromError = 1 Then @@ -290,12 +301,18 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + Var EnoughChange = "yes" diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml index ade369b9..fd2b0c28 100644 --- a/xml/page_payment_cashOther.xml +++ b/xml/page_payment_cashOther.xml @@ -34,10 +34,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var TelephoneNumber# = "" Var PlaySoundLag = "" diff --git a/xml/page_payment_changePin1.xml b/xml/page_payment_changePin1.xml index 74e147a3..2e5d5746 100644 --- a/xml/page_payment_changePin1.xml +++ b/xml/page_payment_changePin1.xml @@ -49,10 +49,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var Ext1a = "" diff --git a/xml/page_payment_changePin2.xml b/xml/page_payment_changePin2.xml index 106f2baa..77e95fff 100644 --- a/xml/page_payment_changePin2.xml +++ b/xml/page_payment_changePin2.xml @@ -50,10 +50,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var Ext1a = "" diff --git a/xml/page_payment_changePinFailed.xml b/xml/page_payment_changePinFailed.xml index 1a58bfb4..fcfdf9b9 100644 --- a/xml/page_payment_changePinFailed.xml +++ b/xml/page_payment_changePinFailed.xml @@ -29,10 +29,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + diff --git a/xml/page_payment_changePinSMS.xml b/xml/page_payment_changePinSMS.xml index 9e113d51..db3cbba7 100644 --- a/xml/page_payment_changePinSMS.xml +++ b/xml/page_payment_changePinSMS.xml @@ -29,10 +29,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + If PinSMSFlag = 1 Then If show_eng = "true" Then diff --git a/xml/page_payment_changePinSuccess.xml b/xml/page_payment_changePinSuccess.xml index 3d1f7e80..d98a8809 100644 --- a/xml/page_payment_changePinSuccess.xml +++ b/xml/page_payment_changePinSuccess.xml @@ -29,10 +29,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index bbd678a1..cfe9232a 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -39,10 +39,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + If web_readyOK = "true" Then Var web_readyOK = "false" diff --git a/xml/page_payment_codeAEON.xml b/xml/page_payment_codeAEON.xml index 77119f68..4acd435c 100644 --- a/xml/page_payment_codeAEON.xml +++ b/xml/page_payment_codeAEON.xml @@ -36,10 +36,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index e5f345e9..c2371125 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index 7cca44ac..017814ca 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeGLX.xml b/xml/page_payment_codeGLX.xml index d99d9b96..847e0c6f 100644 --- a/xml/page_payment_codeGLX.xml +++ b/xml/page_payment_codeGLX.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" Var TelephoneNumber# = "" diff --git a/xml/page_payment_codeGrab.xml b/xml/page_payment_codeGrab.xml index 08012f56..04adbef6 100644 --- a/xml/page_payment_codeGrab.xml +++ b/xml/page_payment_codeGrab.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeKBANK.xml b/xml/page_payment_codeKBANK.xml index 9ace0f0e..efa2d578 100644 --- a/xml/page_payment_codeKBANK.xml +++ b/xml/page_payment_codeKBANK.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" Var TelephoneNumber# = "" diff --git a/xml/page_payment_codeMCard.xml b/xml/page_payment_codeMCard.xml index 2f219560..027b05ec 100644 --- a/xml/page_payment_codeMCard.xml +++ b/xml/page_payment_codeMCard.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" Var TelephoneNumber# = "" diff --git a/xml/page_payment_codeOther.xml b/xml/page_payment_codeOther.xml index 64a3f0d3..15752b74 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -34,10 +34,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var TelephoneNumber# = "" diff --git a/xml/page_payment_codeRabbit.xml b/xml/page_payment_codeRabbit.xml index 8cbf4f4e..8785b54d 100644 --- a/xml/page_payment_codeRabbit.xml +++ b/xml/page_payment_codeRabbit.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index fed5ddaf..2cb816dc 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_codeTrue.xml b/xml/page_payment_codeTrue.xml index 0fa385b8..14a585b0 100644 --- a/xml/page_payment_codeTrue.xml +++ b/xml/page_payment_codeTrue.xml @@ -36,10 +36,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Mode# = 0 Var Str# = "" diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 0f63fe97..02b69aba 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -33,12 +33,19 @@ Var ShowErrorTextY = 945 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" Var ShowErrorTextX = 150 Var ShowErrorTextY = 905 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + Var ShowErrorTextX = 424 + Var ShowErrorTextY = 945 + EndIf + Var Ext1a = "" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 9b2d7d4a..7c206c4a 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -40,16 +40,20 @@ If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" - Var Xtext = 246 Else Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" Var Ytext_16 = 640 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var Ext1a = "" Var ReqAdddata22 = 0 diff --git a/xml/page_payment_credit3-1.xml b/xml/page_payment_credit3-1.xml index 42568e63..114bce99 100644 --- a/xml/page_payment_credit3-1.xml +++ b/xml/page_payment_credit3-1.xml @@ -18,9 +18,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf Var img_popup11 = "/img_popup19.png" diff --git a/xml/page_payment_credit3-Topup.xml b/xml/page_payment_credit3-Topup.xml index 7bbcd609..23fe273a 100644 --- a/xml/page_payment_credit3-Topup.xml +++ b/xml/page_payment_credit3-Topup.xml @@ -23,12 +23,16 @@ Var GetCreditFlag = 0 - + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -57,8 +61,12 @@ If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -68,8 +76,12 @@ If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -119,6 +131,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" @@ -155,6 +168,17 @@ Var posX = 350 EndIf EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + If SumCreditAmount < PayAmountSubDiscount Then + Var Text_X = 170 + Var posX = 250 + Else + Var Text_X = 263 + Var posX = 350 + EndIf + EndIf SAVELOG "EventLanguageOnChange menu -list" @@ -257,10 +281,15 @@ If ViewBill > 0 Then If GetPayInfoFlag = 1 Then Var QRCODE99 = "" If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "QR ကို အသုံးမပြုနိုင်ပါ၊ ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။" Else - Var TextWaiting = "Unable to use QR, please try again later." + If LanguageShow = "MSC" Then + Var TextWaiting = "无法使用二维码，请稍后再试。" + Else + Var TextWaiting = "Unable to use QR, please try again later." + EndIf EndIf Else Var TextWaiting = "ระบบ QR ขัดข้อง โปรดใช้ใหม่ภายหลัง." @@ -736,10 +765,15 @@ If ViewBill > 0 Then EndIf If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "ခဏစောင့်ပါ။..." Else - Var TextWaiting = "Please wait..." + If LanguageShow = "MSC" Then + Var TextWaiting = "请稍等..." + Else + Var TextWaiting = "Please wait..." + EndIf EndIf Else Var TextWaiting = "กรุณารอซักครู่..." diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml index c16d222e..c0cf427c 100644 --- a/xml/page_payment_credit3-TopupCash.xml +++ b/xml/page_payment_credit3-TopupCash.xml @@ -11,11 +11,16 @@ Var Timeout = 0 - If show_eng = "true" Then - If LanguageShow = "MYANMAR" Then + ;inter-multi + If show_eng = "true" Then + If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -116,6 +121,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -137,8 +143,13 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" - EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then @@ -173,21 +184,31 @@ Var CancelFlag = 1 Var CancelCounter = 0 If CoinAmount = 0 Then - If show_eng = "true" Then - If LanguageShow = "MYANMAR" Then + ;inter-multi + If show_eng = "true" Then + If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" EndIf Else - If show_eng = "true" Then - If LanguageShow = "MYANMAR" Then + ;inter-multi + If show_eng = "true" Then + If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -402,10 +423,15 @@ eval( If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then - Var return = "*ပမာဏသည် စျေးနှုန်းနှင့် တူညီရမည်" + Var return = "*ပမာဏသည် စျေးနှုန်းနှင့် တူညီရမည်" Else - Var return = "*Amount must equal or exceed price." + If LanguageShow = "MSC" Then + Var return = "*金额必须等于或超过价格。" + Else + Var return = "*Amount must equal or exceed price." + EndIf EndIf Else Var return = "*จำนวนเงินต้องเท่ากับหรือมากกว่าราคาสินค้า" @@ -450,20 +476,30 @@ Var CancelFlag = 1 If CoinAmount = 0 Then If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" Else - Var RemainAmountStr = "Cancelled" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "已取消" + Else + Var RemainAmountStr = "Cancelled" + EndIf EndIf Else Var RemainAmountStr = "ยกเลิก" EndIf Else If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Else - Var RemainAmountStr = "Keep credit" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "保存余额" + Else + Var RemainAmountStr = "Keep credit" + EndIf EndIf Else Var RemainAmountStr = "เก็บเครดิต" diff --git a/xml/page_payment_credit3-TopupCode.xml b/xml/page_payment_credit3-TopupCode.xml index f2ce61e1..fc3e9368 100644 --- a/xml/page_payment_credit3-TopupCode.xml +++ b/xml/page_payment_credit3-TopupCode.xml @@ -40,10 +40,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var CouponNumber = "" 1000 diff --git a/xml/page_payment_credit3-TopupQR.xml b/xml/page_payment_credit3-TopupQR.xml index b062e56c..117a05cd 100644 --- a/xml/page_payment_credit3-TopupQR.xml +++ b/xml/page_payment_credit3-TopupQR.xml @@ -10,11 +10,16 @@ Var Timeout = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -41,6 +46,7 @@ DEBUGVAR LanguageShow + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" @@ -56,6 +62,11 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then diff --git a/xml/page_payment_credit3-TopupSuccess.xml b/xml/page_payment_credit3-TopupSuccess.xml index a458396a..89284482 100644 --- a/xml/page_payment_credit3-TopupSuccess.xml +++ b/xml/page_payment_credit3-TopupSuccess.xml @@ -54,12 +54,19 @@ Var DirImage3 = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var DirImage3 = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + Var DirImage3 = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var show_eng_button_stage = "Enable" If show_eng = "true" Then Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" diff --git a/xml/page_payment_qr.xml b/xml/page_payment_qr.xml index b4877707..faf45f17 100644 --- a/xml/page_payment_qr.xml +++ b/xml/page_payment_qr.xml @@ -52,9 +52,14 @@ Var DirImage = "ROOT/taobin_project/image/page_payment" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + EndIf Var CashTextWarning = "" diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index dc1cdf0b..55b7029d 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -27,10 +27,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var FlagWaitUpdateCoinAmount = 0 diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml index 6b823d6f..eb4d142b 100644 --- a/xml/page_payment_storeCredit0.xml +++ b/xml/page_payment_storeCredit0.xml @@ -34,11 +34,17 @@ EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/keep_your_change_credits_or_receive.mp3" diff --git a/xml/page_payment_storeCredit2-2.xml b/xml/page_payment_storeCredit2-2.xml index edb8db2d..705d3f4c 100644 --- a/xml/page_payment_storeCredit2-2.xml +++ b/xml/page_payment_storeCredit2-2.xml @@ -40,10 +40,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var FlagWaitUpdateCoinAmount = 0 Var FlagOKButton = 0 diff --git a/xml/page_payment_storeCredit2.xml b/xml/page_payment_storeCredit2.xml index 595c6a20..c172782c 100644 --- a/xml/page_payment_storeCredit2.xml +++ b/xml/page_payment_storeCredit2.xml @@ -31,10 +31,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + Var FlagWaitUpdateCoinAmount = 0 Var FlagOKButton = 0 diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index e36a86d2..332f49e9 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -21,10 +21,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc/" + EndIf + If Seeker.pageStoreCredit0 = 1 Then diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index 6befcc8a..4fcb82dd 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -40,24 +40,25 @@ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + ;inter-multi If LanguageShow = "MSC" Then SetLanguage "MSC" + Else + If LanguageShow = "MTC" Then + SetLanguage "MTC" + Else + If LanguageShow = "MYANMAR" Then + SetLanguage "MYANMAR" + Else + SetLanguage "ENG" + EndIf + EndIf EndIf - - If LanguageShow = "MTC" Then - SetLanguage "MTC" - EndIf - - If LanguageShow = "MYANMAR" Then - SetLanguage "MYANMAR" - Else - SetLanguage "ENG" - EndIf - Else SetLanguage "THAI" EndIf + LED LedDoorDoor 5 255 255 255 255 ;include=ROOT/taobin_project/inc/remove_cup_event_open.inc @@ -90,13 +91,9 @@ EndIf If LanguageShow = "MSC" Then Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_msc/" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" EndIf If LanguageShow = "MTC" Then Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_mtc/" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" EndIf SAVELOG "EventLanguageOnChange menu -list" diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index b514bff7..029a8cab 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -23,8 +23,13 @@ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then - Var DirImage = "ROOT/taobin_project/image/consent_mmr/" + Var DirImage = "ROOT/taobin_project/image/consent_mmr/" + EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/consent_msc/" EndIf If show_eng = "true" Then diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml index e03bf0ab..9053ac81 100644 --- a/xml/page_show_consent2.xml +++ b/xml/page_show_consent2.xml @@ -27,9 +27,13 @@ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage2 = "ROOT/taobin_project/image/consent_mmr/" EndIf + If LanguageShow = "MSC" Then + Var DirImage2 = "ROOT/taobin_project/image/consent_msc/" + EndIf Var AcceptFlag = 0 Var AcceptState = "Disable" diff --git a/xml/page_show_error.lxml b/xml/page_show_error.lxml index 8e7f8aff..4f342b5b 100644 --- a/xml/page_show_error.lxml +++ b/xml/page_show_error.lxml @@ -364,7 +364,7 @@ Var DirImage = CountryRootPath + "image/close_en" EndIf If LanguageShow = "MYANMAR" Then - Var DirImage = CountryRootPath + "image/close_en" + Var DirImage = CountryRootPath + "image/close_mmr" EndIf If LanguageShow = "MSC" Then Var DirImage = CountryRootPath + "image/close_hkg" @@ -422,7 +422,7 @@ Var DirImage = CountryRootPath + "image/close_en" EndIf If LanguageShow = "MYANMAR" Then - Var DirImage = CountryRootPath + "image/close_en" + Var DirImage = CountryRootPath + "image/close_mmr" EndIf If LanguageShow = "MSC" Then Var DirImage = CountryRootPath + "image/close_hkg" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 11773ba4..7869f973 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -80,7 +80,7 @@ Var BottomText = PicturePath + "text_bottom_eng.png" - Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" + Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc" EndIf diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index f6ba2f26..d3d87dc9 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -48,6 +48,7 @@ Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var BottomText = PicturePath + "text_bottom_eng.png" @@ -55,6 +56,13 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" EndIf + If LanguageShow = "MSC" Then + + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc" + EndIf + ;DEBUGVAR StarwState ;DEBUGVAR LidState DEBUGVAR BottomText @@ -109,9 +117,14 @@ Var DirImage2 = "ROOT/taobin_project/image/complete/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/" EndIf + + If LanguageShow = "MSC" Then + Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/" + EndIf Var txtDrinkOKState = "Invisible" Var buttonRemoveCup = "Invisible" @@ -374,9 +387,13 @@ Else Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf + If LanguageShow = "MSC" Then + Var MachineErrorDetailAll = " 请拿杯子。" + EndIf Else If CupChecking = "true" Then If show_eng = "true" Then @@ -384,18 +401,27 @@ Else Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf + If LanguageShow = "MSC" Then + Var MachineErrorDetailAll = " 请拿杯子。" + EndIf + EndIf Else If show_eng = "true" Then Var MachineErrorDetailAll = " Press button for take a cup." Else Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ" EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf + If LanguageShow = "MSC" Then + Var MachineErrorDetailAll = " 按按钮取杯子。" + EndIf EndIf EndIf diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml index 82bef9bc..7be1040c 100644 --- a/xml/page_thankyouMore.xml +++ b/xml/page_thankyouMore.xml @@ -39,6 +39,7 @@ Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var BottomText = PicturePath + "text_bottom_eng.png" @@ -46,6 +47,13 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" EndIf + If LanguageShow = "MSC" Then + + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc" + EndIf + DEBUGVAR StarwState DEBUGVAR LidState DEBUGVAR BottomText diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index e862087b..9026717a 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -14,11 +14,16 @@ Machine WakeUp ;for 3 langs + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" diff --git a/xml/page_topup_credit-ChooseNumber.xml b/xml/page_topup_credit-ChooseNumber.xml index 732f6f7e..9a734b86 100644 --- a/xml/page_topup_credit-ChooseNumber.xml +++ b/xml/page_topup_credit-ChooseNumber.xml @@ -31,11 +31,16 @@ Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf Var Ext1a = "" diff --git a/xml/page_topup_credit.xml b/xml/page_topup_credit.xml index 18e494c1..923686f5 100644 --- a/xml/page_topup_credit.xml +++ b/xml/page_topup_credit.xml @@ -29,9 +29,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf Var Ext1a = "" diff --git a/xml/page_topup_credit2.xml b/xml/page_topup_credit2.xml index 44d3e011..4610b400 100644 --- a/xml/page_topup_credit2.xml +++ b/xml/page_topup_credit2.xml @@ -44,10 +44,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var Ext1a = "" Var ReqAdddata22 = 0 diff --git a/xml/page_topup_credit3-1.xml b/xml/page_topup_credit3-1.xml index 6d7120cc..c35a0d99 100644 --- a/xml/page_topup_credit3-1.xml +++ b/xml/page_topup_credit3-1.xml @@ -18,9 +18,14 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf diff --git a/xml/page_topup_credit3-Topup.xml b/xml/page_topup_credit3-Topup.xml index e8cb2f50..c85e16fb 100644 --- a/xml/page_topup_credit3-Topup.xml +++ b/xml/page_topup_credit3-Topup.xml @@ -22,12 +22,16 @@ Var GetCreditFlag = 0 - + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -120,12 +124,19 @@ Var posX = 380 EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" Var Text_X = 128 Var posX = 350 EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + Var Text_X = 188 + Var posX = 350 + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then @@ -196,10 +207,15 @@ If ViewBill > 0 Then Var TextWaiting = "ระบบ QR ขัดข้อง โปรดใช้ใหม่ภายหลัง." EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "QR ကို အသုံးမပြုနိုင်ပါ၊ ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။" EndIf + If LanguageShow = "MSC" Then + Var TextWaiting = "无法使用二维码，请稍后再试。" + EndIf + Var AmountNumber = "" Var Tel_Confirm_State = "Invisible" @@ -665,10 +681,15 @@ If ViewBill > 0 Then Var TextWaiting = "กรุณารอซักครู่..." EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "ခဏစောင့်ပါ။..." EndIf + If LanguageShow = "MSC" Then + Var TextWaiting = "请稍等..." + EndIf + Var loadingReqState = "Enable" Refresh diff --git a/xml/page_topup_credit3-TopupCash.xml b/xml/page_topup_credit3-TopupCash.xml index deac6c1e..dae41aad 100644 --- a/xml/page_topup_credit3-TopupCash.xml +++ b/xml/page_topup_credit3-TopupCash.xml @@ -12,11 +12,16 @@ Var Timeout = 0 Var CreditAmount = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -94,6 +99,7 @@ DEBUGVAR LanguageShow DEBUGVAR CreditAmount + ;inter-image If LanguageShow = "ENG" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -175,6 +181,33 @@ EndIf EndIf + EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_msc/img2_msc.png" + + Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow ) + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=110" + + If CoinAmount = 0 Then + Var RemainAmountStr = "已取消" + Else + Var RemainAmountStr = "保存余额" + EndIf + If ViewBill > 0 Then + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=110" + Else + If CoinAmount = 0 Then + Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) + Var RemainAmountStr = "充值 " + RemainAmountStr + Var RemainAmountStr = RemainAmountStr + "###size=110" + EndIf + EndIf + EndIf SAVELOG "EventLanguageOnChange menu -list" @@ -205,11 +238,16 @@ If CoinAmount = 0 Then Var CancelFlag = 1 Var CancelCounter = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -217,11 +255,16 @@ Else Var CoinInOK = 1 Var CoinInCounter = 0 + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -373,11 +416,16 @@ Var Timeout = 0 Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -388,11 +436,16 @@ If CoinInOK = 0 Then + ;inter-multi If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -496,8 +549,12 @@ Var CancelCounter = 0 Var CancelFlag = 1 If show_eng = "true" Then + ;inter-multi If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ပယ်ဖျက်ခဲ့သည်။" + EndIf + If LanguageShow = "MSC" Then + Var RemainAmountStr = "已取消" Else Var RemainAmountStr = "Cancelled" EndIf @@ -507,10 +564,15 @@ Else Var ChangeOK = 1 If show_eng = "true" Then + ;inter-text If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ခရက်ဒစ်စုဆောင်းပါ။" Else - Var RemainAmountStr = "Keep credit" + If LanguageShow = "MSC" Then + Var RemainAmountStr = "保存余额" + Else + Var RemainAmountStr = "Keep credit" + EndIf EndIf Else Var RemainAmountStr = "เก็บเครดิต" diff --git a/xml/page_topup_credit3-TopupCode.xml b/xml/page_topup_credit3-TopupCode.xml index 4adacc87..705c5882 100644 --- a/xml/page_topup_credit3-TopupCode.xml +++ b/xml/page_topup_credit3-TopupCode.xml @@ -40,10 +40,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + Var CouponNumber = "" 1000 @@ -619,10 +624,15 @@ Var TextWaiting = "กรุณารอซักครู่..." EndIf + ;inter-text If LanguageShow = "MYANMAR" Then Var TextWaiting = "ခဏစောင့်ပါ။..." EndIf + If LanguageShow = "MSC" Then + Var TextWaiting = "请稍等..." + EndIf + Var goBackBtnState = "Disable" Var Seeker.CodeChannel = 1 diff --git a/xml/page_topup_credit3-TopupQR.xml b/xml/page_topup_credit3-TopupQR.xml index c39a4e80..5e7118b6 100644 --- a/xml/page_topup_credit3-TopupQR.xml +++ b/xml/page_topup_credit3-TopupQR.xml @@ -10,11 +10,16 @@ Var Timeout = 0 - If show_eng = "true" Then + ;inter-multi + If show_eng = "true" Then If LanguageShow = "MYANMAR" Then SetLanguage "MYANMAR" - Else - SetLanguage "ENG" + Else + If LanguageShow = "MSC" Then + SetLanguage "MSC" + Else + SetLanguage "ENG" + EndIf EndIf Else SetLanguage "THAI" @@ -52,9 +57,15 @@ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + SAVELOG "EventLanguageOnChange menu -list" If InternationalEnable = 1 Then diff --git a/xml/page_topup_credit3-TopupSuccess.xml b/xml/page_topup_credit3-TopupSuccess.xml index cd991400..78ff9056 100644 --- a/xml/page_topup_credit3-TopupSuccess.xml +++ b/xml/page_topup_credit3-TopupSuccess.xml @@ -35,9 +35,14 @@ EndIf ;inter-image - If LanguageShow = "MYANMAR" Then - Var text_4 = "/text_4-MMR.png" - EndIf + If LanguageShow = "MYANMAR" Then + Var text_4 = "/text_4-MMR.png" + EndIf + + ;inter-image + If LanguageShow = "MSC" Then + Var text_4 = "/text_4-MSC.png" + EndIf @@ -53,11 +58,17 @@ Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png" EndIf + + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" + EndIf If show_eng = "true" Then Var DirImage3 = "ROOT/taobin_project/image/collectiing_en" @@ -65,10 +76,15 @@ Var DirImage3 = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage3 = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage3 = "ROOT/taobin_project/image/collectiing_msc" + EndIf + If show_eng = "true" Then Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" diff --git a/xml/page_topup_credit3_cash_warning.xml b/xml/page_topup_credit3_cash_warning.xml index 71ab63cc..eb7395be 100644 --- a/xml/page_topup_credit3_cash_warning.xml +++ b/xml/page_topup_credit3_cash_warning.xml @@ -13,10 +13,15 @@ Var DirImage = "ROOT/taobin_project/image/collectiing" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr" EndIf + If LanguageShow = "MSC" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_msc" + EndIf + RootLayoutVisible 3 "hide" Var ReqPayWithCash = 0 diff --git a/xml/payment_cash.ev b/xml/payment_cash.ev index 68e40f69..2eef908a 100644 --- a/xml/payment_cash.ev +++ b/xml/payment_cash.ev @@ -39,11 +39,11 @@ If LanguageShow = "MYANMAR" Then EndIf If LanguageShow = "MSC" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bp_cash.png" - Var FilenameShowbuttonCashBD = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bd_cash.png" - Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment" - Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/page_payment_cash_extend_msc" + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_msc/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_msc/page_payment/bp_cash.png" + Var FilenameShowbuttonCashBD = "ROOT/taobin_project/image/page_payment_msc/page_payment/bd_cash.png" + Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_msc" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var LOADING_STATE_X = 267 Var RemainAmountStrY = 1041 @@ -68,9 +68,9 @@ If RoadShow = "true" Then EndIf If LanguageShow = "MSC" Then - Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bn_cash.png" - Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bp_cash.png" - Var FilenameShowbuttonCashBD = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bd_cash.png" + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_msc/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_msc/page_payment/bp_cash.png" + Var FilenameShowbuttonCashBD = "ROOT/taobin_project/image/page_payment_msc/page_payment/bd_cash.png" EndIf EndIf diff --git a/xml/sometime/page_campaign_ads_lucky_draw.xml b/xml/sometime/page_campaign_ads_lucky_draw.xml index d52043e5..1c75e6c4 100644 --- a/xml/sometime/page_campaign_ads_lucky_draw.xml +++ b/xml/sometime/page_campaign_ads_lucky_draw.xml @@ -24,6 +24,7 @@ EndIf + ;inter-image If LanguageShow = "MYANMAR" Then Var Extension = "_mmr.png" @@ -31,6 +32,13 @@ Var Text_Y = 1468 EndIf + If LanguageShow = "MSC" Then + Var Extension = "_msc.png" + + Var Text_X = 233 + Var Text_Y = 1468 + EndIf + 1000 diff --git a/xml/topview2.xml b/xml/topview2.xml index 82e5eb7c..7a2bdd74 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -305,6 +305,8 @@ ; ; + +; Only for HongKong btn_langs !!