...

xml/page_back_to_main.xml

@@ -17,7 +17,12 @@
 		EndIf 	
 
 		Var BmiYear = PointTaobinStr
-		Var PointCrm = "pdpa1"
+		Var PointCrm = ""
+
+		If FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+
 		Var GetScore = VendingTSID
 		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
 		Var TNumberTaobinMember = ""

xml/page_board.xml

@@ -268,7 +268,7 @@
 <EventClick> 
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
 	
 	TopView "show"
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

xml/page_check_member.xml

@@ -19,13 +19,25 @@
 
 	Var GetCreditFlag = 0
 
+	Var Xtext19 = 260
+	
+
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		Var Xtext19 = 154
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
 	EndIf
 
-	Var FlagWaitUpdateCoinAmount = 0
+	
+
+	Var number7 = ""
+	Var number8 = ""
+	Var number9 = ""
+	Var number10 = ""
+
+	Var StepX = 0
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -48,19 +60,58 @@
 
 
 <EventActionOk>
-	
-	If Ext1a = "ok" Then
 
-		Open "ROOT/taobin_project/xml/page_check_memeber2.xml" 
+	If StepX = 0 Then
+
+		If Ext1a = "ok" Then
+
+			Var TaobinName = Ext1d
+			Var TaobinCoupons = Ext1g
+			Var TaobinExpire = Ext1f
+			Var TaobinLevel = Ext1e
+
+			Var TNumberTaobinMemberXXX = TelephoneNumber
+
+			Trim TNumberTaobinMemberXXX 3
+			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-"
+			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7
+			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8
+			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9
+			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
+
+
+			Var CoffeePointRank = Ext1b
+			INT CoffeePointRank
+
+
+
+			GETACCEXT TelephoneNumber 15
+
+			Var StepX = 1 
+
+		Else
+
+			Var ShowErrorText = "Enable"
+
+
+		EndIf
+	
 
 	Else
 
-		Var ShowErrorText = "Enable"
+		Var PolygonST1 = "Invisible"
+    	Var PolygonST2 = "Invisible"
+		Var CouponSTA =  "Invisible"
+    	Var CouponSTB =  "Invisible"
 
+		Var CouponPage = 1 
+		Var MakeDrinkState = 0
+		Open "ROOT/taobin_project/xml/page_check_member2.xml" 
 
 	EndIf
 	
 
+
 	
 	Refresh
   
@@ -94,6 +145,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>
 
@@ -116,6 +184,23 @@
 		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>
 
@@ -138,6 +223,23 @@
 		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>
 
@@ -160,6 +262,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>
 
@@ -182,6 +301,23 @@
 		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>
 
@@ -204,6 +340,23 @@
 		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>
 
@@ -226,6 +379,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>
 
@@ -248,6 +418,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>
 
@@ -270,6 +456,23 @@
 		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>
 
@@ -293,6 +496,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>
 
@@ -399,7 +618,7 @@
 	
 
 <Image>
-<X> 260 </X>
+<X> Xtext19 </X>
 <Y> 521 </Y>
 <Filename> Var( DirImage + "/text_19.png" )</Filename>
 </Image>

xml/page_check_member2.xml

@@ -9,6 +9,8 @@
 	; On open
 
 	Var Timeout = 0
+
+    
 	
 
     
@@ -25,22 +27,12 @@
 	EndIf
 	
 
-	Var PointDiff = 400 - CoffeePointRank
-
-	Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเดิน จนถึง "
-	Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " 
-
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 +  PointDiff
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง ก่อน "
-
-
-	Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ "
-	Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-	Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ"
+	Var PointDiff = 150 - CoffeePointRank
 
 
 	Var TaobinExpireDay = ""
 	Var TaobinExpireMonth = ""
+    Var TaobinExpireMonthX = ""
 	Var TaobinExpireYear = ""
 
 	
@@ -51,50 +43,62 @@
 
 	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
@@ -110,9 +114,490 @@
 	Var ExpireStrTmp = ExpireStrTmp + " "
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
 
-	Var TaobinLevelDesc1 = TaobinLevelDesc1 + ExpireStrTmp
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " เพื่อเลื่อนขั้นเป็นเต่าบิน"
+
+    If show_eng = "true" Then 
+
+        If TaobinLevel = "1" Then
+            Var TaobinLevelDesc1 = "Shy turtle level"
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel1.png"
+        EndIf
+
+        If TaobinLevel = "2" Then
+            Var TaobinLevelDesc1 = "Walking turtle level"
+            Var TaobinLevelDesc2 = "Earn " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps  "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level"
+
+            Var TaobinLeveImg = "/taoLevel2.png"
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "Flying turtle level "
+        
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel3.png"
+        EndIf
+
+        
+
+
+    Else
+
+        If TaobinLevel = "1" Then
+            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าขี้อาย"
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel1.png"
+        EndIf
+
+        If TaobinLevel = "2" Then
+            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ"
+            Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก"
+
+            Var TaobinLeveImg = "/taoLevel2.png"
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
+        
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel3.png"
+        EndIf
+
+     
+
+    EndIf
+
+
+    
+
+
+
+
+
+    
+
+    Var PolygonST1 = "Invisible"
+    Var PolygonST2 = "Invisible"
+
+
+
+
+    Var CouponInfo1 =  Ext1a
+    Var CouponInfo2 =  Ext1b
+    Var CouponInfo3 =  Ext1c
+    Var CouponInfo4 =  Ext1d
+    Var CouponInfo5 =  Ext1e
+    Var CouponInfo6 =  Ext1f
+    Var CouponInfo7 =  Ext1g
+    Var CouponInfo8 =  Ext1h
+    Var CouponInfo9 =  Ext1i
+    Var CouponInfo10 =  Ext1j
+
+    Var CouponInfoA = ""
+    Var CouponInfoB = ""
+
+    Var CouponSTA =  "Invisible"
+    Var CouponSTB =  "Invisible"
+    Var CouponExpireA =  ""
+    Var CouponExpireB =  ""
+    Var CouponIDA = ""
+    Var CouponIDB = ""
+   
+
+    Var CouponNum = TaobinCoupons
+
+    If CouponPage = 1 Then
+
+        If CouponInfo3 = "" Then
+        Else
+            Var PolygonST2 = "Enable"
+        EndIf
+        Var PolygonST1 = "Invisible"
+
+        Var CouponInfoA = CouponInfo1
+        Var CouponInfoB = CouponInfo2
+        SPLIT  CouponInfoA "/"  1  CouponIDA
+        SPLIT  CouponInfoB "/"  1  CouponIDB
+
+    EndIf
+
+    If CouponPage = 2 Then
+
+        If CouponInfo5 = "" Then
+        Else
+            Var PolygonST2 = "Enable"
+        EndIf
+        Var PolygonST1 = "Enable"
+
+        Var CouponInfoA = CouponInfo3
+        Var CouponInfoB = CouponInfo4
+        SPLIT  CouponInfoA "/"  1  CouponIDA
+        SPLIT  CouponInfoB "/"  1  CouponIDB
+
+    EndIf
+
+    If CouponPage = 3 Then
+
+        If CouponInfo7 = "" Then
+        Else
+            Var PolygonST2 = "Enable"
+        EndIf
+        Var PolygonST1 = "Enable"
+
+        Var CouponInfoA = CouponInfo5
+        Var CouponInfoB = CouponInfo6
+        SPLIT  CouponInfoA "/"  1  CouponIDA
+        SPLIT  CouponInfoB "/"  1  CouponIDB
+
+    EndIf
+
+    If CouponPage = 4 Then
+
+        If CouponInfo9 = "" Then
+        Else
+            Var PolygonST2 = "Enable"
+        EndIf
+        Var PolygonST1 = "Enable"
+
+        Var CouponInfoA = CouponInfo7
+        Var CouponInfoB = CouponInfo8
+        SPLIT  CouponInfoA "/"  1  CouponIDA
+        SPLIT  CouponInfoB "/"  1  CouponIDB
+
+    EndIf
+
+    If CouponPage = 5 Then
+
+        Var PolygonST1 = "Enable"
+        Var PolygonST2 = "Invisible"
+
+        Var CouponInfoA = CouponInfo9
+        Var CouponInfoB = CouponInfo10
+        SPLIT  CouponInfoA "/"  1  CouponIDA
+        SPLIT  CouponInfoB "/"  1  CouponIDB
+        
+
+    EndIf
+
+   
+
+
+
+    If show_eng = "true" Then 
+
+        If CouponIDA = "" Then
+        Else
+        
+
+            Var CouponSTA =  "Enable"
+            Var CouponExireA_D = ""
+            Var CouponExireA_M = ""
+            Var CouponExireA_Y = ""
+            SPLIT  CouponInfoA "/"  4  CouponExireA_D
+            SPLIT  CouponInfoA "/"  5  CouponExireA_M
+            SPLIT  CouponInfoA "/"  6  CouponExireA_Y
+            INT CouponExireA_D
+            INT CouponExireA_Y
+            Var CouponExireA_Y = CouponExireA_Y + 0
+
+            If CouponExireA_M = "01" Then
+                Var CouponExireA_M = "January"
+            EndIf
+
+            If CouponExireA_M = "02" Then
+                Var CouponExireA_M = "February"
+            EndIf
+
+            If CouponExireA_M = "03" Then
+                Var CouponExireA_M = "March"
+            EndIf
+
+            If CouponExireA_M = "04" Then
+                Var CouponExireA_M = "April"
+            EndIf
+
+            If CouponExireA_M = "05" Then
+                Var CouponExireA_M = "May"
+            EndIf
+
+            If CouponExireA_M = "06" Then
+                Var CouponExireA_M = "June"
+            EndIf
+
+            If CouponExireA_M = "07" Then
+                Var CouponExireA_M = "July"
+            EndIf
+
+            If CouponExireA_M = "08" Then
+                Var CouponExireA_M = "August"
+            EndIf
+
+            If CouponExireA_M = "09" Then
+                Var CouponExireA_M = "September"
+            EndIf
+
+            If CouponExireA_M = "10" Then
+                Var CouponExireA_M = "October"
+            EndIf
+
+            If CouponExireA_M = "11" Then
+                Var CouponExireA_M = "November"
+            EndIf
+
+            If CouponExireA_M = "12" Then
+                Var CouponExireA_M = "December"
+            EndIf
+
+            Var CouponExpireA = CouponExpireA + CouponExireA_D
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_M
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_Y
+
+
+        EndIf
+
+        If CouponIDB = "" Then
+        Else
+        
+
+            Var CouponSTB =  "Enable"
+            Var CouponExireB_D = ""
+            Var CouponExireB_M = ""
+            Var CouponExireB_Y = ""
+            SPLIT  CouponInfoB "/"  4  CouponExireB_D
+            SPLIT  CouponInfoB "/"  5  CouponExireB_M
+            SPLIT  CouponInfoB "/"  6  CouponExireB_Y
+            INT CouponExireB_D
+            INT CouponExireB_Y
+            Var CouponExireB_Y = CouponExireB_Y + 0
+
+            If CouponExireB_M = "01" Then
+                Var CouponExireB_M = "January"
+            EndIf
+
+            If CouponExireB_M = "02" Then
+                Var CouponExireB_M = "February"
+            EndIf
+
+            If CouponExireB_M = "03" Then
+                Var CouponExireB_M = "March"
+            EndIf
+
+            If CouponExireB_M = "04" Then
+                Var CouponExireB_M = "April"
+            EndIf
+
+            If CouponExireB_M = "05" Then
+                Var CouponExireB_M = "May"
+            EndIf
+
+            If CouponExireB_M = "06" Then
+                Var CouponExireB_M = "June"
+            EndIf
+
+            If CouponExireB_M = "07" Then
+                Var CouponExireB_M = "July"
+            EndIf
+
+            If CouponExireB_M = "08" Then
+                Var CouponExireB_M = "August"
+            EndIf
+
+            If CouponExireB_M = "09" Then
+                Var CouponExireB_M = "September"
+            EndIf
+
+            If CouponExireB_M = "10" Then
+                Var CouponExireB_M = "October"
+            EndIf
+
+            If CouponExireB_M = "11" Then
+                Var CouponExireB_M = "November"
+            EndIf
+
+            If CouponExireB_M = "12" Then
+                Var CouponExireB_M = "December"
+            EndIf
+
+            Var CouponExpireB = CouponExpireB + CouponExireB_D
+            Var CouponExpireB = CouponExpireB + "  "
+            Var CouponExpireB = CouponExpireB + CouponExireB_M
+            Var CouponExpireB = CouponExpireB + "  " 
+            Var CouponExpireB = CouponExpireB + CouponExireB_Y
+
+        EndIf
+
+        Var CouponText = "Coupons (" + CouponNum
+        Var CouponText = CouponText + ")"
+
+    Else
+
+   
+
+
+        If CouponIDA = "" Then
+        Else
+        
+
+            Var CouponSTA =  "Enable"
+            Var CouponExireA_D = ""
+            Var CouponExireA_M = ""
+            Var CouponExireA_Y = ""
+            SPLIT  CouponInfoA "/"  4  CouponExireA_D
+            SPLIT  CouponInfoA "/"  5  CouponExireA_M
+            SPLIT  CouponInfoA "/"  6  CouponExireA_Y
+            INT CouponExireA_D
+            INT CouponExireA_Y
+            Var CouponExireA_Y = CouponExireA_Y + 543
+
+            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 = CouponExpireA + CouponExireA_D
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_M
+            Var CouponExpireA = CouponExpireA + "  "
+            Var CouponExpireA = CouponExpireA + CouponExireA_Y
+
+
+        EndIf
+
+        If CouponIDB = "" Then
+        Else
+        
+
+            Var CouponSTB =  "Enable"
+            Var CouponExireB_D = ""
+            Var CouponExireB_M = ""
+            Var CouponExireB_Y = ""
+            SPLIT  CouponInfoB "/"  4  CouponExireB_D
+            SPLIT  CouponInfoB "/"  5  CouponExireB_M
+            SPLIT  CouponInfoB "/"  6  CouponExireB_Y
+            INT CouponExireB_D
+            INT CouponExireB_Y
+            Var CouponExireB_Y = CouponExireB_Y + 543
+
+            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 = CouponExpireB + CouponExireB_D
+            Var CouponExpireB = CouponExpireB + "  "
+            Var CouponExpireB = CouponExpireB + CouponExireB_M
+            Var CouponExpireB = CouponExpireB + "  " 
+            Var CouponExpireB = CouponExpireB + CouponExireB_Y
+
+        EndIf
+
+        Var CouponText = "คูปอง (" + CouponNum
+        Var CouponText = CouponText + ")"
+
+    EndIf
+
+   
+
+
+   
+    
+
+
 	
 
 </EventOpen>
@@ -126,6 +611,10 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
 
+        If MakeDrinkState = 1 Then
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 
 	EndIf
@@ -185,34 +674,34 @@
 
 <Image>
 <X> 158 </X>
-<Y> 665 </Y>
+<Y> 591 </Y>
 <Filename> Var( DirImage + "/img_popup1.png" )</Filename>
 </Image>
 
 <Image>
 <X> 158 </X>
-<Y> 665 </Y>
+<Y> 591 </Y>
 <Filename> Var( DirImage + "/img_popup3.png" )</Filename>
 </Image>
 
 
 <Image>
 <X> 243 </X>
-<Y> 722 </Y>
+<Y> 648 </Y>
 <Filename> Var( DirImage + "/text5.png" )</Filename>
 </Image>
 
 <Image>
 <X> 243 </X>
-<Y> 857 </Y>
+<Y> 783 </Y>
 <Filename> Var( DirImage + "/text4.png" )</Filename>
 </Image>
 
 
 <Image>
 <X> 624 </X>
-<Y> 734 </Y>
-<Filename> Var( DirImage + "/taoLevel1.png" )</Filename>
+<Y> 660 </Y>
+<Filename> Var( DirImage + TaobinLeveImg )</Filename>
 </Image>
 ;
 
@@ -226,7 +715,7 @@
 
 <Text>
 <X> 250 </X>
-<Y> 745 </Y>
+<Y> 684 </Y>
 <Size> 35 </Size>
 <Width> 1000 </Width>
 <Font> KanitRegularTTF </Font>
@@ -236,7 +725,7 @@
 
 <Text>
 <X> 250 </X>
-<Y> 800 </Y>
+<Y> 725 </Y>
 <Size> 20 </Size>
 <Width> 1000 </Width>
 <Font> KanitRegularTTF </Font>
@@ -246,7 +735,7 @@
 
 <Text>
 <X> 250 </X>
-<Y> 890 </Y>
+<Y> 828 </Y>
 <Size> 50 </Size>
 <Width> 120 </Width>
 <Font> KanitRegularTTF </Font>
@@ -256,7 +745,7 @@
 
 <Text>
 <X> 250 </X>
-<Y> 990 </Y>
+<Y> 898 </Y>
 <Size> 25 </Size>
 <Width> 1000 </Width>
 <Font> KanitRegularTTF </Font>
@@ -266,7 +755,7 @@
 
 <Text>
 <X> 250 </X>
-<Y> 1020 </Y>
+<Y> 935 </Y>
 <Size> 20 </Size>
 <Width> 1000 </Width>
 <Font> KanitRegularTTF </Font>
@@ -277,7 +766,7 @@
 
 
 <Button>
-<X> 398 </X>
+<X> 430 </X>
 <Y> 1597 </Y>
 <Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
@@ -285,12 +774,114 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
+
+    If MakeDrinkState = 1 Then
+       Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    EndIf
+
 	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 </EventClick>
 </Button>
 
 
 
+<Text>
+<X> 243 </X>
+<Y> 1064 </Y>
+<Size> 24 </Size>
+<Width> 120 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> CouponText </Value>
+</Text>
+
+
+
+
+<Button>
+<X> 243 </X>
+<Y> 1131 </Y>
+<State> CouponSTA </State>
+<Filename> Var( DirImage + "/imgCouponFree.png" )</Filename>
+<FilenamePress> Var( DirImage + "/imgCouponFree.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+	
+    Var CouponSendSms = CouponIDA
+    Var CouponExpireDate = CouponExpireA
+    Open "ROOT/taobin_project/xml/page_check_member3.xml"
+</EventClick>
+</Button>
+
+<Text>
+<X> 480 </X>
+<Y> 1287 </Y>
+<Size> 15 </Size>
+<Width> 120 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> CouponExpireA </Value>
+</Text>
+
+
+<Button>
+<X> 243 </X>
+<Y> 1355 </Y>
+<State> CouponSTB </State>
+<Filename> Var( DirImage + "/imgCouponFree.png" )</Filename>
+<FilenamePress> Var( DirImage + "/imgCouponFree.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+	
+     Var CouponSendSms = CouponIDB
+    Var CouponExpireDate = CouponExpireB
+     Open "ROOT/taobin_project/xml/page_check_member3.xml"
+</EventClick>
+</Button>
+
+<Text>
+<X> 480 </X>
+<Y> 1511 </Y>
+<Size> 15 </Size>
+<Width> 120 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> 0x746253 </Color>
+<Value> CouponExpireB </Value>
+</Text>
+
+
+<Button>
+<X> 173 </X>
+<Y> 1290 </Y>
+<State> PolygonST1 </State>
+<Filename> "ROOT/taobin_project/image/display_point/Polygon1.png"</Filename>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var CouponPage =  CouponPage - 1
+    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+</EventClick>
+</Button>
+
+<Button>
+<X> 860 </X>
+<Y> 1290 </Y>
+<State> PolygonST2 </State>
+<Filename> "ROOT/taobin_project/image/display_point/Polygon2.png"</Filename>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var CouponPage =  CouponPage + 1
+    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+</EventClick>
+</Button>
+
+
+
 
 </Popup>
 	

xml/page_check_member3.xml

@@ -9,11 +9,11 @@
 	; On open
 
 	Var Timeout = 0
-	Var TNumberTaobinMember = TelephoneNumber
 	
-    Var CoffeePointStr = CoffeePoint
 
-    SAVELOG TelephoneNumber
+    
+
+    
 
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_en"
@@ -24,18 +24,27 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 	
-	
+
 
 	
-	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
-	Var Timeout = Timeout + 1
-	If Timeout > 20 Then
-  
-			Open "ROOT/taobin_project/xml/page_catalog.xml"
+
 	
+
+	
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+
+        If MakeDrinkState = 1 Then
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
 	EndIf
 
 	TimerReset
@@ -51,8 +60,7 @@
 </EventSecurity>
 
 <EventActionOk>
-	
-
+	;Open "ROOT/taobin_project/xml/page_check_member2.xml"
 </EventActionOk>
 
 
@@ -94,36 +102,22 @@
 
 <Image>
 <X> 158 </X>
-<Y> 665 </Y>
-<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
-</Image>
-
-<Image>
-<X> 158 </X>
-<Y> 665 </Y>
-<Filename> Var( DirImage + "/img_popup3.png" )</Filename>
+<Y> 593 </Y>
+<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
 </Image>
 
 
-<Image>
-<X> 243 </X>
-<Y> 722 </Y>
-<Filename> Var( DirImage + "/text5.png" )</Filename>
-</Image>
-
-<Image>
-<X> 243 </X>
-<Y> 857 </Y>
-<Filename> Var( DirImage + "/text4.png" )</Filename>
-</Image>
 
 
-<Image>
-<X> 624 </X>
-<Y> 734 </Y>
-<Filename> Var( DirImage + "/taoLevel1.png" )</Filename>
-</Image>
-;
+
+
+
+
+
+
+
+
+
 
 
 
@@ -132,63 +126,68 @@
 
 
 <Button>
-<X> 398 </X>
-<Y> 1597 </Y>
-<Filename> Var( DirImage + "/bn_cancle2.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancle2.png" )</FilenamePress>
+<X> 237 </X>
+<Y> 1480 </Y>
+<Filename> Var( DirImage + "/bn_useCoupon.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_useCoupon.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
-	
-    Open "ROOT/taobin_project/xml/page_catalog.xml"
+	Var BmiYear = CouponSendSms
+	Var PointCrm = ""
+	Var GetScore = ""
+    AddData 12 TelephoneNumber  BmiYear PointCrm GetScore
+    
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 440 </X>
+<Y> 1597 </Y>
+<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+    ;Var BmiYear = "30/30"
+	;Var PointCrm = ""
+	;Var GetScore = ""
+    ;AddData 11 TelephoneNumber  BmiYear PointCrm GetScore
+    
+    If MakeDrinkState = 1 Then
+       Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    EndIf
+
+    Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 </EventClick>
 </Button>
 
 
 
-
-;<Text>
-;<X> 420 </X>
-;<Y> 638 </Y>
-;<Size> 56 </Size>
-;<Font> KanitBoldTTF </Font>
-;<Color> 0x513C2F </Color>
-;<Value> TelephoneNumber </Value>
-;<Format> Telnum </Format>
-;</Text>
-;
-;
-;<Text>
-;<X> 323 </X>
-;<Y> 865 </Y>
-;<Width> 434 </Width>
-;<Align> Center </Align>
-;<Size> 64 </Size>
-;<Font> KanitSemiBoldTTF </Font>
-;<Color> 0xDE794E </Color>
-;<Value> CoffeePoint </Value>
-;</Text>
-
-<Text>
-<X> 250 </X>
-<Y> 1241 </Y>
-<Width> 434 </Width>
-<Size> 64 </Size>
-<Font> KanitSemiBoldTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> pointStr </Value>
-</Text>
-
-<Text>
+<Button>
 <X> 243 </X>
-<Y> 902 </Y>
-<Size> 50 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
+<Y> 661 </Y>
+<Filename> Var( DirImage + "/imgCouponFree.png" )</Filename>
+<FilenamePress> Var( DirImage + "/imgCouponFree.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+<Text>
+<X> 480 </X>
+<Y> 815 </Y>
+<Size> 15 </Size>
+<Width> 120 </Width>
 <Font> KanitRegularTTF </Font>
-<Color> 0xDE794E </Color>
-<Value> CoffeePointRank </Value>
+<Color> 0x746253 </Color>
+<Value> CouponExpireDate </Value>
 </Text>
 
 
@@ -198,5 +197,6 @@
 
 
 
+
 </Popup>
 	

xml/page_collect_point_1.xml

@@ -25,6 +25,8 @@
 	Var number9 = ""
 	Var number10 = ""
 
+	Var FromConsent = 0
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_collect_point_2.xml

@@ -63,8 +63,8 @@
 		EndIf
 	Else
 		If Ext1a = "" Then
-			Var CoffeePoint = 0 
-			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+			;Var CoffeePoint = 0 
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			
 		Else
 
@@ -73,6 +73,7 @@
 				Var TaobinName = Ext1d
 				Var TaobinCoupons = Ext1g
 				Var TaobinExpire = Ext1f
+				Var TaobinLevel = Ext1e
 
 				Var TNumberTaobinMemberXXX = TelephoneNumber
 
@@ -84,7 +85,7 @@
 				Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
 
 
-				Var PointTaobin = PayAmount / 20
+				Var PointTaobin = PayAmount / 3
 
 
 				Var PointTaobinStr = "" + PointTaobin
@@ -99,6 +100,8 @@
 				INT CoffeePoint1
 			
 				Var CoffeePoint = PointTaobin + CoffeePoint1
+				Var CoffeePointRank = CoffeePointRank + PointTaobin
+
 				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 
 			Else

xml/page_collect_point_3.xml

@@ -46,28 +46,25 @@
 	
 	Var pImageStr = pImageStr + ".png"
 
+	Var pImageStr = "ROOT/taobin_project/image/display_point" + pImageStr
+
 	Var pointStr = ""
 	Var pointStr = pointStr + CoffeePointTmp
 	Var pointStr = pointStr + "/"
 	Var pointStr = pointStr + "30"
 
 
-	Var PointDiff = 400 - CoffeePointRank
-
-	Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเดิน จนถึง "
-	Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " 
-
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 +  PointDiff
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง ก่อน "
+	Var PointDiff = 150 - CoffeePointRank
 
 
-	Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ "
-	Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-	Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ"
+
+
+	
 
 
 	Var TaobinExpireDay = ""
 	Var TaobinExpireMonth = ""
+	 Var TaobinExpireMonthX = ""
 	Var TaobinExpireYear = ""
 
 	
@@ -78,50 +75,62 @@
 
 	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
@@ -137,13 +146,100 @@
 	Var ExpireStrTmp = ExpireStrTmp + " "
 	Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
 
-	Var TaobinLevelDesc1 = TaobinLevelDesc1 + ExpireStrTmp
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + ExpireStrTmp
-	Var TaobinLevelDesc2 = TaobinLevelDesc2 + " เพื่อเลื่อนขั้นเป็นเต่าบิน"
+	
+
 
 	
 
 
+
+	If show_eng = "true" Then 
+
+		Var TaobinLevelDesc3 = "You have coupons "
+		Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
+		Var TaobinLevelDesc3 = TaobinLevelDesc3 + " numbers"
+
+		If TaobinLevel = "1" Then
+            Var TaobinLevelDesc1 = "Shy turtle level"
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel1.png"
+        EndIf
+
+        If TaobinLevel = "2" Then
+            Var TaobinLevelDesc1 = "Walking turtle level"
+            Var TaobinLevelDesc2 = "Earn " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level"
+
+            Var TaobinLeveImg = "/taoLevel2.png"
+
+			If CoffeePointRank > 149 Then
+				Var TaobinLeveImg = "/taoLevel3.png"
+
+				Var TaobinLevelDesc1 =  "Flying turtle level "
+            	Var TaobinLevelDesc2 = ""
+
+			EndIf
+
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "Flying turtle level "
+        
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel3.png"
+        EndIf
+
+
+
+	Else
+
+		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 TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง "
+            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก"
+
+            Var TaobinLeveImg = "/taoLevel2.png"
+
+			If CoffeePointRank > 149 Then
+				Var TaobinLeveImg = "/taoLevel3.png"
+
+				Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
+            	Var TaobinLevelDesc2 = ""
+
+			EndIf
+
+        EndIf
+
+        If TaobinLevel = "3" Then
+            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
+        
+            Var TaobinLevelDesc2 = ""
+
+            Var TaobinLeveImg = "/taoLevel3.png"
+        EndIf
+
+
+	EndIf
+
+
+
+	
+	Var CheckCoupons = 0
 	
 
 </EventOpen>
@@ -161,13 +257,18 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
 
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		
 
     	; goto lid straw
     	If CoffeePoint > 29 Then
 			Open "ROOT/taobin_project/xml/page_display_get_free.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			If FromConsent = 1 Then 
+				Open "ROOT/taobin_project/xml/page_display_get_free.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			EndIf
+			
 		EndIf
 	EndIf
 
@@ -184,7 +285,10 @@
 </EventSecurity>
 
 <EventActionOk>
-	;Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	If  CheckCoupons = 1 Then
+		Var MakeDrinkState = 1
+		Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventActionOk>
 
 
@@ -253,7 +357,7 @@
 <Image>
 <X> 624 </X>
 <Y> 734 </Y>
-<Filename> Var( DirImage + "/taoLevel1.png" )</Filename>
+<Filename> Var( DirImage + TaobinLeveImg )</Filename>
 </Image>
 ;
 
@@ -261,7 +365,7 @@
 <Image>
 <X> 252 </X>
 <Y> 1341 </Y>
-<Filename> Var( DirImage + pImageStr )</Filename>
+<Filename> pImageStr </Filename>
 </Image>
 
 
@@ -275,8 +379,13 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
-	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	If FromConsent = 1 Then 
+		Open "ROOT/taobin_project/xml/page_display_get_free.xml"
+	Else
+
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
 
 </EventClick>
 </Button>
@@ -293,9 +402,10 @@
 	; goto lid straw
 
 
-	AddData 11 "0617944956"  "3330/3330" "" ""
 
-	;GETACCEXT TelephoneNumber 15
+
+	GETACCEXT TelephoneNumber 15
+	Var CheckCoupons = 1
 	
 
 </EventClick>

xml/page_display_get_free.xml

@@ -17,10 +17,36 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
-	Var TaobinLevel = 0
 
 	Var MemberState1 = "Enable"
 	Var MemberState2 = "Invisible"
+	Var MemberState3 = "Invisible"
+
+	If TaobinLevel = "1" Then
+    	Var MemberState1 = "Invisible"
+		Var MemberState2 = "Enable"
+		Var MemberState3 = "Invisible"
+    EndIf
+
+	If TaobinLevel = "2" Then
+      	Var MemberState1 = "Enable"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Invisible"
+    EndIf
+
+	If TaobinLevel = "3" Then
+       	Var MemberState1 = "Enable"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Invisible"
+    EndIf
+
+	If FromConsent = 1 Then
+		Var MemberState1 = "Invisible"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Enable"
+	EndIf
+
+
 	 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -103,6 +129,13 @@
 <Filename> Var( DirImage + "/img_popup2.png" )</Filename>
 </Image>
 
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> MemberState3 </State>
+<Filename> Var( DirImage + "/img_popup3.png" )</Filename>
+</Image>
+
 
 <Button>
 <X> 397 </X>

xml/page_drinkok.xml

@@ -32,7 +32,10 @@
 		EndIf 	
 
 		Var BmiYear = PointTaobinStr
-		Var PointCrm = "pdpa1"
+		Var PointCrm = ""
+		If FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
 		Var GetScore = VendingTSID
 		AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
 		Var TNumberTaobinMember = ""

xml/page_payment.xml

@@ -73,7 +73,7 @@
 	Var CountStepPackPayment = CountStepPackPayment + 1
 	If CountStepPackPayment = 1 Then
 
-		Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+		
 
 		SAVELOG ExtendData
 

xml/page_payment_cash.xml

@@ -595,18 +595,31 @@
 
 
 ; back
-;<Button>
-;<X> 19 </X>
-;<Y> 420 </Y>
-;<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
-;<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
-;	
-;</EventClick>
-;</Button>
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+	If CoinInOK = 0 Then
+        If CancelFlag = 0 Then
+			SAVELOG "ButtonCancleMain  > Cancle Order."
+            CoinVending OFF
+			Var CancelFlag = 1
+			Var CancelCounter = 0
+
+			If FlagQROpened = 1 Then 
+				Var CancelNumber = 12
+			EndIf
+			
+        EndIf
+	EndIf
+	
+</EventClick>
+</Button>
 
 
 

xml/page_payment_code.xml

@@ -179,6 +179,14 @@
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
 
+			If VendingCode = "C33" Then
+				Var VendingCampaign = PayAmount
+				CoinVending OFF
+            	;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
+		    	MakeDrinkV1  SelectDrink SelectSugarID
+		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			EndIf
+
 
 			Var ShowErrorText = "Enable"
 			Var GetPayInfoFlag = 0

xml/page_payment_credit.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>
@@ -321,7 +321,7 @@
 		Var ShowTextNumber = "Enable"
 	EndIf
 
-	;Var ShowErrorText = "Invisible"
+	Var ShowErrorText = "Invisible"
 	TimerReset
 	Refresh
 	

xml/page_payment_credit2.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>
@@ -25,6 +25,8 @@
 
     Var PinNumber = ""
 
+	Var ReqFlag = 0
+
 	
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
@@ -59,20 +61,29 @@
 <EventActionOk>
 	
 
+	If ReqFlag = 0 Then 
     
 			
 	
 
-	If Ext1a = "ok" Then
-		
-		Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
+		If Ext1a = "ok" Then
+
+			If Ext1c = "" Then
+			
+				Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
+			Else
+
+			EndIf
+		Else
+			Var ShowErrorText = "Enable"
+			Var PinNumber = ""
+			Var ShowTextNumber1 = "Invisible"
+			Var ShowTextNumber2 = "Invisible"
+			Var ShowTextNumber3 = "Invisible"
+			Var ShowTextNumber4 = "Invisible"
+		EndIf
 	Else
-	 	Var ShowErrorText = "Enable"
-		Var PinNumber = ""
-		Var ShowTextNumber1 = "Invisible"
-		Var ShowTextNumber2 = "Invisible"
-		Var ShowTextNumber3 = "Invisible"
-		Var ShowTextNumber4 = "Invisible"
+
 	EndIf
 
 	Refresh
@@ -493,8 +504,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1432 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_getPin.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_getPin.png" </FilenamePress>
+<Filename> Var( DirImage + "/bn_getPin.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_getPin.png")  </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -502,7 +513,21 @@
     ;Open "ROOT/taobin_project/xml/page_catalog.xml" 
 
     Var ShowSentSmsText = "Enable"
+
+	Var BmiYear = ""
+	Var PointCrm = ""
+	Var GetScore = ""
+    AddData 13 TelephoneNumber  BmiYear PointCrm GetScore
+
+
+	Var ShowTextNumber1 = "Invisible"
+	Var ShowTextNumber2 = "Invisible"
+	Var ShowTextNumber3 = "Invisible"
+	Var ShowTextNumber4 = "Invisible"
+	 Var PinNumber = ""
+   
     
+	Var ReqFlag = 1
     
     TimerReset
 	Refresh
@@ -594,6 +619,8 @@
 
 	Var ShowSentSmsText = "Invisible"
 
+	Var ShowErrorText = "Invisible"
+
 	TimerReset
 	Refresh
 	
@@ -633,6 +660,8 @@
 
 			GETACCEXT DataTmp 13
 
+			Var ReqFlag = 0
+
 		Refresh
     
 	

xml/page_payment_credit3.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>

xml/page_payment_storeCredit.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>

xml/page_payment_storeCredit0.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 
 <EventOpen>
@@ -29,7 +29,7 @@
 		
 
 	Else
-		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		Var DirImage = "ROOT/taobin_project/image/collectiing"
 		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
 		
 	EndIf

xml/page_payment_storeCredit2.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>

xml/page_payment_storeCredit3.xml

@@ -4,7 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-<Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
+
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>

xml/page_show_consent.xml

@@ -83,8 +83,10 @@
 		Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
 	EndIf
 
+	Var FromConsent = 1
+
     Var StepGetPoint = 1
-    GETACCEXT TelephoneNumber 5
+    GETACCEXT TelephoneNumber 14
 	; goto lid straw
 	Open "ROOT/taobin_project/xml/page_collect_point_2.xml"