From fb66d181449a8da3098233161f55fe352cc9eb22 Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Wed, 9 Mar 2022 13:50:01 +0700
Subject: [PATCH] fix bug coupon

---
 xml/page_check_member2.xml    |  2 +-
 xml/page_check_newmember2.xml | 53 +++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml
index 54d9c66f..fe886d4f 100644
--- a/xml/page_check_member2.xml
+++ b/xml/page_check_member2.xml
@@ -573,7 +573,7 @@
             If CouponTypeB = "103" Then
                 Var CouponNameB = "/imgCouponC40.png"
             EndIf 
-            If CouponTypeB = "103" Then
+            If CouponTypeB = "105" Then
                 Var CouponNameB = "/imgCouponC38.png"
             EndIf 
             If CouponTypeB = "106" Then
diff --git a/xml/page_check_newmember2.xml b/xml/page_check_newmember2.xml
index fd13f902..967e3eb3 100644
--- a/xml/page_check_newmember2.xml
+++ b/xml/page_check_newmember2.xml
@@ -51,7 +51,7 @@
 	
 
 	Var Timeout = Timeout + 1
-	If Timeout > 30 Then
+	If Timeout > 40 Then
 		Open "ROOT/taobin_project/xml/page_check_member.xml"
 	EndIf
 
@@ -75,14 +75,6 @@
 
 			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
 			Var CoffeePointRankTmp = CoffeePointRank
@@ -118,6 +110,8 @@
                 Var CouponInfo9 =  Ext1i
                 Var CouponInfo10 =  Ext1j
 
+                Var GetAccFlag = 0
+
                 Open "ROOT/taobin_project/xml/page_check_member2.xml" 
             
         EndIf
@@ -126,16 +120,45 @@
    
 
     If  GetAccFlag = 1 Then
-        Var GetAccFlag = 0
+        Var GetAccFlag = 2
 
 		If Ext1a = "ok" Then
 
+            Var TaobinName = ""
+			Var TaobinCoupons = ""
+			Var TaobinExpire = ""
+			Var TaobinLevel = ""
+
+			Var TNumberTaobinMemberXXX = TelephoneNumber
+
+			Var CoffeePointRank = 0
+			INT CoffeePointRank
+			Var CoffeePointRankTmp = CoffeePointRank
+
+            Var PolygonST1 = "Invisible"
+            Var PolygonST2 = "Invisible"
+            Var CouponSTA =  "Invisible"
+            Var CouponSTB =  "Invisible"
+
+            Var CouponPage = 1 
+            Var MakeDrinkState = 0
+            Var CouponInfo1 =  ""
+            Var CouponInfo2 =  ""
+            Var CouponInfo3 =  ""
+            Var CouponInfo4 =  ""
+            Var CouponInfo5 =  ""
+            Var CouponInfo6 =  ""
+            Var CouponInfo7 =  ""
+            Var CouponInfo8 =  ""
+            Var CouponInfo9 =  ""
+            Var CouponInfo10 =  ""
+
             Var TaobinCredit =  0
-            ;GETACCEXT TelephoneNumber 14
-            ;Var StepX = 1
-            ;Var Ext1a = "ok"
+            GETACCEXT TelephoneNumber 14
+            Var StepX = 1
+            Var Ext1a = "ok"
              
-			Open "ROOT/taobin_project/xml/page_check_member2.xml" 
+			;Open "ROOT/taobin_project/xml/page_check_member2.xml" 
 		Else
 			Var ShowErrorText = "Enable"
             Var ShowText = "Invisible"
@@ -154,7 +177,7 @@
 </EventActionOk>
 
 <EventActionError>
-	If  GetAccFlag = 1 Then
+	If  GetAccFlag > 0 Then
    		Var ShowErrorText = "Enable"
         Var ShowText = "Invisible"
         Var GetAccFlag = 0