diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index f4e9b245..1f51f7a7 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -1032,11 +1032,11 @@
If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 31
- Var PointCrm = "2"
+ Var Cid = 33
+ Var PointCrm = "0"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
- AddData Cid TelephoneNumberx Seeker.CodeNumber PointCrm GetScore
+ AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
Var Seeker.CodeChannel = 0
EndIf
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index 8db9907d..f1bf60a9 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -723,11 +723,11 @@
Else
If Seeker.VendingCode = "MKFOO" Then
- Var Cid = 31
- Var PointCrm = "2"
+ Var Cid = 33
+ Var PointCrm = "0"
Var GetScore = "1"
Var TelephoneNumberx = "0899999999"
- AddData Cid TelephoneNumberx Seeker.CodeNumber PointCrm GetScore
+ AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
Var Seeker.CodeChannel = 0
EndIf
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index 4be00710..a9e391a8 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -118,6 +118,8 @@
Var TaobinLevel = Ext1e
Var TaobinPDPA = Ext1h
+ Var TaobinPromoX = Ext1j
+
DEBUGVAR TaobinPDPA
Var PointTaobinTmp = Ext1i
@@ -194,6 +196,14 @@
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
+ If TaobinPromoX = "p2.no_otp" Then
+ Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
+ EndIf
+
+ If TaobinPromoX = "p2.unused" Then
+ Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
+ EndIf
+
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
Else
diff --git a/xml/page_identityMember_number.xml b/xml/page_identityMember_number.xml
index 51ea0781..2d72ad93 100644
--- a/xml/page_identityMember_number.xml
+++ b/xml/page_identityMember_number.xml
@@ -22,11 +22,13 @@
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment_en/page_payment"
;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else
Var DirImage = "ROOT/taobin_project/image/collect_point1"
+ Var DirImage2 = "ROOT/taobin_project/image/page_payment"
;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
@@ -34,7 +36,7 @@
-
+ Var FailState = "Invisible"
Var Tel_Confirm_Flag = 1
@@ -49,6 +51,10 @@
Var MaxNumber = 12
EndIf
+ Var StepGetServer = 0
+ var OtpCode = ""
+
+ Var failTime = 0
1000
@@ -65,16 +71,84 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
-
Open "ROOT/taobin_project/xml/page_catalog2.xml"
EndIf
+ If FailState = "Enable" Then
+
+ Var failTime = failTime + 1
+ If failTime >= 3 Then
+ Var failTime = 0
+ Var FailState = "Invisible"
+ Var TelephoneNumber = ""
+ Var Tel_Confirm_State = "Invisible"
+ Var Timeout = 0
+ EndIf
+
+ EndIf
+
+
Refresh
TimerReset
+
+
+ DEBUGVAR Ext1a
+ DEBUGVAR Ext1b
+ DEBUGVAR Ext1c
+
+
+ If StepGetServer = 1 Then
+
+
+ Var LineST = Ext1a
+ Var ProST = Ext1b
+ Var OtpCode = Ext1c
+
+ If LineST = "found_line" Then
+
+ If ProST = "p2.unused" Then
+ Open "ROOT/taobin_project/xml/page_identityMember_otp.xml"
+ EndIf
+
+ If ProST = "p2.used" Then
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-2.png"
+ EndIf
+
+ If ProST = "p2.no_otp" Then
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+ EndIf
+
+ If ProST = "p2.error" Then
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+ EndIf
+
+ Else
+
+ Var load_gif_stage = "Invisible"
+ Var FailState = "Enable"
+ Var img_popup16 = "/img_popup16-1.png"
+
+ EndIf
+
+ Refresh
+ EndIf
+
+
+
+
+
+
+
@@ -432,7 +506,14 @@
If Tel2DFlag = 1 Then
- Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"
+ ;Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"
+
+
+ Var Param1 = TelephoneNumber
+ GETACCEXT Param1 29
+ Var StepGetServer = 1
+
+
Else
If show_eng = "true" Then
@@ -479,6 +560,23 @@
+
+ 0
+ 380
+ FailState
+ "ROOT/taobin_project/image/page_payment/alpha.png"
+
+
+
+
+ 249
+ 751
+ FailState
+ Var( DirImage2 + img_popup16 )
+
+
+
+