diff --git a/xml/event/pepween/page_collect_point_pro_pepween_2.xml b/xml/event/pepween/page_collect_point_pro_pepween_2.xml
index 847cf36d..866117c8 100644
--- a/xml/event/pepween/page_collect_point_pro_pepween_2.xml
+++ b/xml/event/pepween/page_collect_point_pro_pepween_2.xml
@@ -82,22 +82,6 @@
-
- If StepGetPoint = 0 Then
- If PdpaAsk = 0 Then
- Open "ROOT/taobin_project/xml/page_show_consent.xml"
- Else
- Var StepGetPoint = 1
-
- Var TelephoneNumber = TelephoneNumberX
-
- GETACCEXT TelephoneNumber 14
- Var Ext1a = ""
- Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
- EndIf
- Else
-
-
If Ext1a = "" Then
Var Seeker.TaobinErrorNetwork = 1
@@ -107,88 +91,112 @@
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_error.xml"
Else
-
- If Ext1a = "ok" Then
-
- Var TaobinName = Ext1d
- Var TaobinCoupons = Ext1g
- Var TaobinExpire = Ext1f
- Var TaobinLevel = Ext1e
- Var TaobinPDPA = Ext1h
-
- Var TaobinPromoX = Ext1j
-
- DEBUGVAR TaobinPDPA
-
- Var PointTaobinTmp = Ext1i
-
- DEBUGVAR PointTaobinTmp
- INT PointTaobinTmp
-
- INT TaobinPDPA
-
-
+ Var TaobinName = Ext1b
Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber
- ;Var PointTaobinTmp = 4
-
- Var PointTaobin = PointTaobinTmp
- Var pTaobin = PointTaobin
-
- DEBUGVAR TaobinLevel
-
- If TaobinLevel = "1" Then
- Var pTaobin = PayAmount / 20
- Else
- Var pTaobin = PayAmount / 15
- EndIf
-
- If pTaobin > 0 Then
- Var pTaobinX = PointTaobin / pTaobin
- If pTaobinX >= 2 Then
- Var Point2X = 1
- EndIf
- EndIf
-
-
Var Seeker.PointTaobinStr = ParamCP
Var Seeker.TNumberTaobinMember = TelephoneNumberX
-
-
- Var CoffeePointRank = Ext1b
- INT CoffeePointRank
-
- Var CoffeePoint1 = Ext1c
- INT CoffeePoint1
-
- Var CoffeePoint = PointTaobin + CoffeePoint1
- Var CoffeePointOld = CoffeePoint1
Var PopweenPointState[0] = 0
- Var PopweenPointState[1] = 1
+ Var PopweenPointState[1] = 0
Var PopweenPointState[2] = 0
Var PopweenPointState[3] = 0
Var PopweenPointState[4] = 0
- Var PopweenPointState[5] = 1
+ Var PopweenPointState[5] = 0
Var PopweenPointState[6] = 0
- Var PopweenPointState[7] = 1
+ Var PopweenPointState[7] = 0
Var PopweenPointState[8] = 0
- Var PopweenPointState[9] = 1
- Var PopweenPointState[10] = 1
+ Var PopweenPointState[9] = 0
+ Var PopweenPointState[10] = 0
Var PopweenPointState[11] = 0
Var PopweenPointState[12] = 0
- Var PopweenPointNewIndex = 11 - 1
+ DEBUGVAR Ext1a
+
+ SPLIT Ext1a "/" 1 PopweenPointState[0]
+ SPLIT Ext1a "/" 2 PopweenPointState[1]
+ SPLIT Ext1a "/" 3 PopweenPointState[2]
+ SPLIT Ext1a "/" 4 PopweenPointState[3]
+ SPLIT Ext1a "/" 5 PopweenPointState[4]
+ SPLIT Ext1a "/" 6 PopweenPointState[5]
+ SPLIT Ext1a "/" 7 PopweenPointState[6]
+ SPLIT Ext1a "/" 8 PopweenPointState[7]
+ SPLIT Ext1a "/" 9 PopweenPointState[8]
+ SPLIT Ext1a "/" 10 PopweenPointState[9]
+ SPLIT Ext1a "/" 11 PopweenPointState[10]
+ SPLIT Ext1a "/" 12 PopweenPointState[11]
+ SPLIT Ext1a "/" 13 PopweenPointState[12]
- If TaobinLevel = 1 Then
- Var CoffeePointRank = CoffeePointRank + 0
- Else
- Var CoffeePointRank = CoffeePointRank + PointTaobin
- EndIf
+ INT PopweenPointState[0]
+ INT PopweenPointState[1]
+ INT PopweenPointState[2]
+ INT PopweenPointState[3]
+ INT PopweenPointState[4]
+ INT PopweenPointState[5]
+ INT PopweenPointState[6]
+ INT PopweenPointState[7]
+ INT PopweenPointState[8]
+ INT PopweenPointState[9]
+ INT PopweenPointState[10]
+ INT PopweenPointState[11]
+ INT PopweenPointState[12]
- Var CoffeePointRankTmp = CoffeePointRank
+ DEBUGVAR PopweenPointState[0]
+ DEBUGVAR PopweenPointState[1]
+ DEBUGVAR PopweenPointState[2]
+ DEBUGVAR PopweenPointState[3]
+ DEBUGVAR PopweenPointState[4]
+ DEBUGVAR PopweenPointState[5]
+ DEBUGVAR PopweenPointState[6]
+ DEBUGVAR PopweenPointState[7]
+ DEBUGVAR PopweenPointState[8]
+ DEBUGVAR PopweenPointState[9]
+ DEBUGVAR PopweenPointState[10]
+ DEBUGVAR PopweenPointState[11]
+ DEBUGVAR PopweenPointState[12]
+ Var PopweenPointNewIndex = 0
+
+ If Seeker.ProductCode = "12-99-05-0053" Then
+ Var PopweenPointNewIndex = 0
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0054" Then
+ Var PopweenPointNewIndex = 1
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0055" Then
+ Var PopweenPointNewIndex = 2
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0057" Then
+ Var PopweenPointNewIndex = 3
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0058" Then
+ Var PopweenPointNewIndex = 4
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0059" Then
+ Var PopweenPointNewIndex = 5
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0060" Then
+ Var PopweenPointNewIndex = 6
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0061" Then
+ Var PopweenPointNewIndex = 7
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0062" Then
+ Var PopweenPointNewIndex = 8
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0064" Then
+ Var PopweenPointNewIndex = 9
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0065" Then
+ Var PopweenPointNewIndex = 10
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0056" Then
+ Var PopweenPointNewIndex = 11
+ EndIf
+ If Seeker.ProductCode = "12-99-05-0066" Then
+ Var PopweenPointNewIndex = 11
+ EndIf
DEBUGVAR Seeker.PointTaobinStr
DEBUGVAR Seeker.TNumberTaobinMember
@@ -209,35 +217,8 @@
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
- If PayAmount >= 20 Then
-
- 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
-
- EndIf
-
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_3.xml"
-
- Else
-
- Var Seeker.TaobinErrorNetwork = 1
-
- Var Seeker.PointTaobinStr = ParamCP
- Var TelephoneNumber = TelephoneNumberX
- Var Seeker.TNumberTaobinMember = TelephoneNumber
- Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_error.xml"
- EndIf
-
-
-
-
EndIf
- EndIf
diff --git a/xml/event/pepween/page_collect_point_pro_pepween_3.xml b/xml/event/pepween/page_collect_point_pro_pepween_3.xml
index 7277a204..a628375b 100644
--- a/xml/event/pepween/page_collect_point_pro_pepween_3.xml
+++ b/xml/event/pepween/page_collect_point_pro_pepween_3.xml
@@ -195,7 +195,16 @@
Else
Var CheckCouponState = "Disable"
EndIf
-
+
+ Var CurrentPointSlot = "10"
+ Var CurrentPointCheck = ""
+ Var val3 = "X"
+ AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+; Var CodeType = "114"
+; Var val2 = "X"
+; Var val3 = "X"
+; AddData 36 TelephoneNumber CodeType val2 val3
1000
@@ -206,7 +215,7 @@
- ;Var Timeout = Timeout + 1
+ Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index fd6a9146..e49e2d02 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -105,7 +105,7 @@
Var Param1 = Param1 + ParamCP
If PepweenEnable = 1 Then
- GETACCEXT Param1 23
+ GETACCEXT TelephoneNumber 31
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"
Else
GETACCEXT Param1 23
@@ -138,7 +138,7 @@
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
If PepweenEnable = 1 Then
- GETACCEXT Param1 23
+ GETACCEXT TelephoneNumber 31
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"
Else
GETACCEXT Param1 23
@@ -614,7 +614,7 @@
Var Param1 = Param1 + ParamCP
If PepweenEnable = 1 Then
- GETACCEXT Param1 23
+ GETACCEXT TelephoneNumber 31
Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"
Else
GETACCEXT Param1 23