Merge branch 'taobinNew'

xml/page_check_member2.xml

@@ -41,6 +41,75 @@
 	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 = "มกราคม"
@@ -106,6 +175,8 @@
 
         Var TaobinExpireYear = TaobinExpireYear + 543
 
+    EndIf
+
 
 	Var ExpireStrTmp = ""
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@@ -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 = ""
 

xml/page_collect_point_1.xml

@@ -28,6 +28,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
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_collect_point_3.xml

@@ -74,6 +74,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 = "มกราคม"
@@ -139,6 +209,8 @@
 
 	Var TaobinExpireYear = TaobinExpireYear + 543
 
+	EndIf
+
 
 	Var ExpireStrTmp = ""
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@@ -180,6 +252,7 @@
 
 				Var TaobinLevelDesc1 =  "Flying turtle level "
             	Var TaobinLevelDesc2 = ""
+				Var CoffeePointRank = 0
 
 			EndIf
 
@@ -221,6 +294,7 @@
 
 				Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
             	Var TaobinLevelDesc2 = ""
+				Var CoffeePointRank = 0
 
 			EndIf
 

xml/page_payment_credit.xml

@@ -27,6 +27,12 @@
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
 	EndIf
+
+	Var number7 = ""
+	Var number8 = ""
+	Var number9 = ""
+	Var number10 = ""
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -100,6 +106,23 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "1"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "1"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "1"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "1"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -122,6 +145,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "2"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "2"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "2"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "2"
+	EndIf
 </EventClick>
 </Button>
 
@@ -144,6 +183,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "3"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "3"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "3"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "3"
+	EndIf
 </EventClick>
 </Button>
 
@@ -166,6 +221,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "4"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "4"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "4"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "4"
+	EndIf
 </EventClick>
 </Button>
 
@@ -188,6 +259,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "5"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "5"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "5"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "5"
+	EndIf
 </EventClick>
 </Button>
 
@@ -210,6 +297,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "6"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "6"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "6"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "6"
+	EndIf
 </EventClick>
 </Button>
 
@@ -232,6 +335,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "7"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "7"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "7"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "7"
+	EndIf
 </EventClick>
 </Button>
 
@@ -254,6 +373,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "8"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "8"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "8"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "8"
+	EndIf
 </EventClick>
 </Button>
 
@@ -276,6 +411,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "9"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "9"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "9"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "9"
+	EndIf
 </EventClick>
 </Button>
 
@@ -299,6 +450,22 @@
 	TimerReset
 	Refresh
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "0"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "0"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "0"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "0"
+	EndIf
 </EventClick>
 </Button>
 

xml/page_payment_storeCredit.xml

@@ -27,6 +27,13 @@
 	EndIf
 
 	Var FlagWaitUpdateCoinAmount = 0
+
+	Var number7 = ""
+	Var number8 = ""
+	Var number9 = ""
+	Var number10 = ""
+
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -158,6 +165,23 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "1"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "1"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "1"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "1"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -180,6 +204,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "2"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "2"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "2"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "2"
+	EndIf
 </EventClick>
 </Button>
 
@@ -202,6 +242,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "3"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "3"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "3"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "3"
+	EndIf
 </EventClick>
 </Button>
 
@@ -224,6 +280,23 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "4"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "4"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "4"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "4"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -246,6 +319,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "5"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "5"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "5"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "5"
+	EndIf
 </EventClick>
 </Button>
 
@@ -268,6 +357,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "6"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "6"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "6"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "6"
+	EndIf
 </EventClick>
 </Button>
 
@@ -290,6 +395,23 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "7"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "7"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "7"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "7"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -312,6 +434,23 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "8"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "8"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "8"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "8"
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -334,6 +473,22 @@
 		Var Tel_Confirm_State = "Enable"
 	EndIf
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "9"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "9"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "9"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "9"
+	EndIf
 </EventClick>
 </Button>
 
@@ -357,6 +512,22 @@
 	TimerReset
 	Refresh
 	Var ShowErrorText = "Invisible"
+
+	If TelNumLen = 7 Then
+		Var number7 = "0"
+	EndIf
+
+	If TelNumLen = 8 Then
+		Var number8 = "0"
+	EndIf
+
+	If TelNumLen = 9 Then
+		Var number9 = "0"
+	EndIf
+
+	If TelNumLen = 10 Then
+		Var number10 = "0"
+	EndIf
 </EventClick>
 </Button>