diff --git a/inter/tha/xml/multi/page_catalog_group_recommend.lxml b/inter/tha/xml/multi/page_catalog_group_recommend.lxml index 421f344d..3feffa48 100644 --- a/inter/tha/xml/multi/page_catalog_group_recommend.lxml +++ b/inter/tha/xml/multi/page_catalog_group_recommend.lxml @@ -39,6 +39,7 @@ EndIf ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml" + RootLayoutVisible 3 "show" RootLayoutVisible 13 "show" diff --git a/inter/tha/xml/multi/page_instance2.xml b/inter/tha/xml/multi/page_instance2.xml index b0a6b5fd..b09288ce 100644 --- a/inter/tha/xml/multi/page_instance2.xml +++ b/inter/tha/xml/multi/page_instance2.xml @@ -6,7 +6,7 @@ ; open from page_catalog.lxml - RootLayoutVisible 3 "show" + RootLayoutVisible 3 "show" RootLayoutVisible 13 "show" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" diff --git a/xml/page_board.xml b/xml/page_board.xml index 400087e4..51b5e2be 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1885,7 +1885,7 @@ PRICE "Reset" "-" If InternationalEnable = 1 Then If CountryName = "Thailand" Then SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" Else ; show language icon OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" @@ -2334,7 +2334,7 @@ PRICE "Reset" "-" If CountryName = "Thailand" Then SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" Else ; show language icon OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" RootLayoutVisible 3 "show" diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index e854afca..650c47b4 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -7,7 +7,7 @@ ; On open - + RootLayoutVisible 3 "show" If LuckyDrawCampaign = 1 Then ;Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" EndIf @@ -223,6 +223,7 @@ 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" + Var text5Img = "/text5.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" If TaobinExpireMonth = "01" Then @@ -346,7 +347,7 @@ Var TaobinLeveImg = "/taoLevel4.png" EndIf - If CouponIDA = "" Then + If CouponIDA = "" Then Else @@ -458,6 +459,7 @@ Var CouponExireA_M = "December" EndIf + Var CouponExpireA = "" Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + CouponExireA_M @@ -465,7 +467,7 @@ Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = "Expires " + CouponExpireA - + Var CouponExpireAPosittion = 1375 EndIf @@ -580,6 +582,7 @@ Var CouponExireB_M = "December" EndIf + Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + CouponExireB_M @@ -587,6 +590,7 @@ Var CouponExpireB = CouponExpireB + CouponExireB_Y Var CouponExpireB = "Expires " + CouponExpireB + EndIf @@ -597,6 +601,7 @@ If LanguageShow = "THAI" Then Var DirImage = "ROOT/taobin_project/image/display_point" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + Var text5Img = "/text5.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" If TaobinExpireMonth = "01" Then @@ -719,7 +724,7 @@ Var TaobinLeveImg = "/taoLevel4.png" EndIf - If CouponIDA = "" Then + If CouponIDA = "" Then Else @@ -829,6 +834,7 @@ Var CouponExireA_M = "ธันวาคม" EndIf + Var CouponExpireA = "" Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + CouponExireA_M @@ -836,7 +842,7 @@ Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = "หมดอายุ " + CouponExpireA - + Var CouponExpireAPosittion = 1375 EndIf @@ -950,6 +956,7 @@ Var CouponExireB_M = "ธันวาคม" EndIf + Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + CouponExireB_M @@ -957,6 +964,7 @@ Var CouponExpireB = CouponExpireB + CouponExireB_Y Var CouponExpireB = "หมดอายุ " + CouponExpireB + EndIf @@ -966,133 +974,134 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr" - If TaobinExpireMonth = "01" Then - Var TaobinExpireMonth = "Jan" - Var TaobinExpireMonthX = "ဇန္နဝါရီလ" - EndIf - - If TaobinExpireMonth = "02" Then - Var TaobinExpireMonth = "Feb" - Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ" - EndIf - - If TaobinExpireMonth = "03" Then - Var TaobinExpireMonth = "Mar" - Var TaobinExpireMonthX = "မတ္လ" - EndIf - - If TaobinExpireMonth = "04" Then - Var TaobinExpireMonth = "Apr" - Var TaobinExpireMonthX = "ဧျပီလ" - EndIf - - If TaobinExpireMonth = "05" Then - Var TaobinExpireMonth = "May" - Var TaobinExpireMonthX = "ေမလ" - EndIf - - If TaobinExpireMonth = "06" Then - Var TaobinExpireMonth = "Jun" - Var TaobinExpireMonthX = "ဇြန္လ" - EndIf - - If TaobinExpireMonth = "07" Then - Var TaobinExpireMonth = "Jul" - Var TaobinExpireMonthX = "ဇူလိုင္လ" - EndIf - - If TaobinExpireMonth = "08" Then - Var TaobinExpireMonth = "Aug" - Var TaobinExpireMonthX = "ၾသဂုတ္လ" - EndIf - - If TaobinExpireMonth = "09" Then - Var TaobinExpireMonth = "Sep" - Var TaobinExpireMonthX = "စက္တင္ဘာလ" - EndIf - - If TaobinExpireMonth = "10" Then - Var TaobinExpireMonth = "Oct" - Var TaobinExpireMonthX = "ေအာက္တိုဘာလ" - EndIf - - If TaobinExpireMonth = "11" Then - Var TaobinExpireMonth = "Nov" - Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ" - EndIf - - If TaobinExpireMonth = "12" Then - Var TaobinExpireMonth = "Dec" - Var TaobinExpireMonthX = "ဒီဇင္ဘာလ" - EndIf - - INT TaobinExpireYear - INT TaobinExpireDay - - Var TaobinExpireYear = TaobinExpireYear + 0 - - ;Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ " - ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons - ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ" - - If TaobinLevel = "1" Then - Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်" + Var text5Img = "/text5-MMR.png" + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "Jan" + Var TaobinExpireMonthX = "ဇန္နဝါရီလ" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "Feb" + Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "Mar" + Var TaobinExpireMonthX = "မတ္လ" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "Apr" + Var TaobinExpireMonthX = "ဧျပီလ" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "May" + Var TaobinExpireMonthX = "ေမလ" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "Jun" + Var TaobinExpireMonthX = "ဇြန္လ" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "Jul" + Var TaobinExpireMonthX = "ဇူလိုင္လ" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "Aug" + Var TaobinExpireMonthX = "ၾသဂုတ္လ" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "Sep" + Var TaobinExpireMonthX = "စက္တင္ဘာလ" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "Oct" + Var TaobinExpireMonthX = "ေအာက္တိုဘာလ" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "Nov" + Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "Dec" + Var TaobinExpireMonthX = "ဒီဇင္ဘာလ" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + ;Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ " + ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons + ;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 = "Earn " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်" + + Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + ;Var TaobinLeveImg = "/taoLevel3.png" + + ;Var TaobinLevelDesc1 = "လိပ်အဆင့် " Var TaobinLevelDesc2 = "" - - Var TaobinLeveImg = "/taoLevel1.png" + ;Var CoffeePointRank = CoffeePointRank - 150 + EndIf - - If TaobinLevel = "2" Then - Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်" - Var PointDiff = 150 - CoffeePointRank - Var TaobinLevelDesc2 = "Earn " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ " - Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်" - - 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 = "Earn " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ " - Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်" - - 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 - + + EndIf + + If TaobinLevel = "3" Then + Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp + + Var PointDiff = 200 - CoffeePointRank + Var TaobinLevelDesc2 = "Earn " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်" + + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 199 Then + ;Var TaobinLeveImg = "/taoLevel4.png" + + ;Var TaobinLevelDesc1 = "သခင်လိပ်အဆင့် " Var TaobinLevelDesc2 = "" - - Var TaobinLeveImg = "/taoLevel4.png" + ;Var CoffeePointRank = CoffeePointRank - 350 + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" + EndIf - If CouponIDA = "" Then - Else + If CouponIDA = "" Then + Else Var CouponSTA = "Enable" @@ -1201,6 +1210,7 @@ Var CouponExireA_M = "ဒီဇင္ဘာလ" EndIf + Var CouponExpireA = "" Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + CouponExireA_M @@ -1208,7 +1218,7 @@ Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = "သက်တမ်းကုန် " + CouponExpireA - + Var CouponExpireAPosittion = 1400 EndIf @@ -1322,6 +1332,7 @@ Var CouponExireB_M = "ဒီဇင္ဘာလ" EndIf + Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + CouponExireB_M @@ -1335,8 +1346,8 @@ Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum Var CouponText = CouponText + ")" - ;inter-image - Var text5Img = "/text5-MMR.png" + + EndIf SAVELOG "EventLanguageOnChange menu -list" @@ -1640,7 +1651,7 @@ 372 - 1375 + CouponExpireAPosittion 15 600 KanitRegularTTF