diff --git a/image/consent/img_popup2.png b/image/consent/img_popup2.png index d3fb257c..4f07e465 100644 Binary files a/image/consent/img_popup2.png and b/image/consent/img_popup2.png differ diff --git a/image/consent_en/img_popup2.png b/image/consent_en/img_popup2.png index 8409d564..4a77f45b 100644 Binary files a/image/consent_en/img_popup2.png and b/image/consent_en/img_popup2.png differ diff --git a/image/display_point/taobinP0.png b/image/display_point/taobinP0.png new file mode 100644 index 00000000..438c7d6a Binary files /dev/null and b/image/display_point/taobinP0.png differ diff --git a/image/display_point/text4.png b/image/display_point/text4.png index 669292e1..f1ba727b 100644 Binary files a/image/display_point/text4.png and b/image/display_point/text4.png differ diff --git a/image/display_point_en/text4.png b/image/display_point_en/text4.png index 2bf0d996..c5c2b365 100644 Binary files a/image/display_point_en/text4.png and b/image/display_point_en/text4.png differ diff --git a/image/page2/bn_main_page_member.png b/image/page2/bn_main_page_member.png index bd9327dd..57bb9f14 100644 Binary files a/image/page2/bn_main_page_member.png and b/image/page2/bn_main_page_member.png differ diff --git a/image/page2/bp_main_page_member.png b/image/page2/bp_main_page_member.png index f1719ea0..6c571fbd 100644 Binary files a/image/page2/bp_main_page_member.png and b/image/page2/bp_main_page_member.png differ diff --git a/image/page2_en/page2/bn_main_page_member.png b/image/page2_en/page2/bn_main_page_member.png index a6fdc256..49cebabe 100644 Binary files a/image/page2_en/page2/bn_main_page_member.png and b/image/page2_en/page2/bn_main_page_member.png differ diff --git a/image/page2_en/page2/bp_main_page_member.png b/image/page2_en/page2/bp_main_page_member.png new file mode 100644 index 00000000..06720501 Binary files /dev/null and b/image/page2_en/page2/bp_main_page_member.png differ diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 4bc48677..7b4974af 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -41,70 +41,141 @@ SPLIT TaobinExpire "/" 2 TaobinExpireMonth SPLIT TaobinExpire "/" 3 TaobinExpireYear - If TaobinExpireMonth = "01" Then - Var TaobinExpireMonth = "ม.ค." - Var TaobinExpireMonthX = "มกราคม" - EndIf - If TaobinExpireMonth = "02" Then - Var TaobinExpireMonth = "ก.พ." - Var TaobinExpireMonthX = "กุมภาพันธ์" - EndIf + If show_eng = "true" Then + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "Jan" + Var TaobinExpireMonthX = "January" + EndIf - If TaobinExpireMonth = "03" Then - Var TaobinExpireMonth = "มี.ค." - Var TaobinExpireMonthX = "มีนาคม" - EndIf + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "Feb" + Var TaobinExpireMonthX = "February" + EndIf - If TaobinExpireMonth = "04" Then - Var TaobinExpireMonth = "เม.ย." - Var TaobinExpireMonthX = "เมษายน" - EndIf + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "Mar" + Var TaobinExpireMonthX = "March" + EndIf - If TaobinExpireMonth = "05" Then - Var TaobinExpireMonth = "พ.ค." - Var TaobinExpireMonthX = "พฤษภาคม" - EndIf + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "Apr" + Var TaobinExpireMonthX = "April" + EndIf - If TaobinExpireMonth = "06" Then - Var TaobinExpireMonth = "มิ.ย." - Var TaobinExpireMonthX = "มิถุนายน" - EndIf + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "May" + Var TaobinExpireMonthX = "May" + EndIf - If TaobinExpireMonth = "07" Then - Var TaobinExpireMonth = "ก.ค." - Var TaobinExpireMonthX = "กรกฎาคม" - EndIf + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "Jun" + Var TaobinExpireMonthX = "June" + EndIf - If TaobinExpireMonth = "08" Then - Var TaobinExpireMonth = "ส.ค." - Var TaobinExpireMonthX = "สิงหาคม" - EndIf + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "Jul" + Var TaobinExpireMonthX = "July" + EndIf - If TaobinExpireMonth = "09" Then - Var TaobinExpireMonth = "ก.ย." - Var TaobinExpireMonthX = "กันยายน" - EndIf + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "Aug" + Var TaobinExpireMonthX = "August" + EndIf - If TaobinExpireMonth = "10" Then - Var TaobinExpireMonth = "ต.ค." - Var TaobinExpireMonthX = "ตุลาคม" - EndIf + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "Sep" + Var TaobinExpireMonthX = "September" + EndIf - If TaobinExpireMonth = "11" Then - Var TaobinExpireMonth = "พ.ย." - Var TaobinExpireMonthX = "พฤศจิกายน" - EndIf + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "Oct" + Var TaobinExpireMonthX = "October" + EndIf - If TaobinExpireMonth = "12" Then - Var TaobinExpireMonth = "ธ.ค." - Var TaobinExpireMonthX = "ธันวาคม" - EndIf + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "Nov" + Var TaobinExpireMonthX = "November" + EndIf - INT TaobinExpireYear - INT TaobinExpireDay + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "Dec" + Var TaobinExpireMonthX = "December" + EndIf - Var TaobinExpireYear = TaobinExpireYear + 543 + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + Else + + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "ม.ค." + Var TaobinExpireMonthX = "มกราคม" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "ก.พ." + Var TaobinExpireMonthX = "กุมภาพันธ์" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "มี.ค." + Var TaobinExpireMonthX = "มีนาคม" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "เม.ย." + Var TaobinExpireMonthX = "เมษายน" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "พ.ค." + Var TaobinExpireMonthX = "พฤษภาคม" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "มิ.ย." + Var TaobinExpireMonthX = "มิถุนายน" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "ก.ค." + Var TaobinExpireMonthX = "กรกฎาคม" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "ส.ค." + Var TaobinExpireMonthX = "สิงหาคม" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "ก.ย." + Var TaobinExpireMonthX = "กันยายน" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "ต.ค." + Var TaobinExpireMonthX = "ตุลาคม" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "พ.ย." + Var TaobinExpireMonthX = "พฤศจิกายน" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "ธ.ค." + Var TaobinExpireMonthX = "ธันวาคม" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 543 + + EndIf Var ExpireStrTmp = "" @@ -134,7 +205,7 @@ EndIf If TaobinLevel = "3" Then - Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc1 = "Flying turtle level until" + ExpireStrTmp Var TaobinLevelDesc2 = "" @@ -163,7 +234,7 @@ EndIf If TaobinLevel = "3" Then - Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp Var TaobinLevelDesc2 = "" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 7bcad181..37a5f353 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -27,6 +27,24 @@ Var FromConsent = 0 + If TNumberTaobinCredit == "" Then + Else + + Var TelephoneNumber = TNumberTaobinCredit + + Var StepGetPoint = 0 + + Var PdpaAsk = 0 + + Var OperatorTemp = "" + Var CreditAmount = 0 + Var OperatorStatus = "" + Var AccountType = "" + GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + + EndIf + 1000 diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 857f832c..a7b885b3 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -73,6 +73,76 @@ SPLIT TaobinExpire "/" 2 TaobinExpireMonth SPLIT TaobinExpire "/" 3 TaobinExpireYear + + If show_eng = "true" Then + + If TaobinExpireMonth = "01" Then + Var TaobinExpireMonth = "Jan" + Var TaobinExpireMonthX = "January" + EndIf + + If TaobinExpireMonth = "02" Then + Var TaobinExpireMonth = "Feb" + Var TaobinExpireMonthX = "February" + EndIf + + If TaobinExpireMonth = "03" Then + Var TaobinExpireMonth = "Mar" + Var TaobinExpireMonthX = "March" + EndIf + + If TaobinExpireMonth = "04" Then + Var TaobinExpireMonth = "Apr" + Var TaobinExpireMonthX = "April" + EndIf + + If TaobinExpireMonth = "05" Then + Var TaobinExpireMonth = "May" + Var TaobinExpireMonthX = "May" + EndIf + + If TaobinExpireMonth = "06" Then + Var TaobinExpireMonth = "Jun" + Var TaobinExpireMonthX = "June" + EndIf + + If TaobinExpireMonth = "07" Then + Var TaobinExpireMonth = "Jul" + Var TaobinExpireMonthX = "July" + EndIf + + If TaobinExpireMonth = "08" Then + Var TaobinExpireMonth = "Aug" + Var TaobinExpireMonthX = "August" + EndIf + + If TaobinExpireMonth = "09" Then + Var TaobinExpireMonth = "Sep" + Var TaobinExpireMonthX = "September" + EndIf + + If TaobinExpireMonth = "10" Then + Var TaobinExpireMonth = "Oct" + Var TaobinExpireMonthX = "October" + EndIf + + If TaobinExpireMonth = "11" Then + Var TaobinExpireMonth = "Nov" + Var TaobinExpireMonthX = "November" + EndIf + + If TaobinExpireMonth = "12" Then + Var TaobinExpireMonth = "Dec" + Var TaobinExpireMonthX = "December" + EndIf + + INT TaobinExpireYear + INT TaobinExpireDay + + Var TaobinExpireYear = TaobinExpireYear + 0 + + Else + If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "ม.ค." Var TaobinExpireMonthX = "มกราคม" @@ -138,6 +208,8 @@ Var TaobinExpireYear = TaobinExpireYear + 543 + EndIf + Var ExpireStrTmp = "" Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay @@ -179,6 +251,7 @@ Var TaobinLevelDesc1 = "Flying turtle level " Var TaobinLevelDesc2 = "" + Var CoffeePointRank = 0 EndIf @@ -220,6 +293,7 @@ Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " Var TaobinLevelDesc2 = "" + Var CoffeePointRank = 0 EndIf