WTC+SGP: change collect pt ui and member regis QR

This commit is contained in:
Pakin 2024-10-04 17:28:51 +07:00
parent da3e42901e
commit 9ad0f10a7c
25 changed files with 565 additions and 349 deletions

View file

@ -10,7 +10,7 @@
Var Timeout = 0
SAVELOG UnitTestType
If UnitTestType = "1" Then
Var CoffeePoint = 10
Open "ROOT/taobin_project/xml/page_show_consent.xml"
@ -22,12 +22,12 @@
Var Seeker.TaobinErrorNetwork = 0
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
@ -42,6 +42,10 @@
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Var TaobinLevel = 2
Var CoffeePointRank = 55
DEBUGVAR TaobinLevel
; reset
Var DebugBypassCollectPt2 = 0
@ -75,10 +79,10 @@
Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
@ -93,51 +97,51 @@
DEBUGVAR XPercent
Var XPercent = XPercent / InitCNT
EndIf
DEBUGVAR XPercent
EndIf
Var Timeout = Timeout + 1
If Timeout > 30 Then
Var TaobinLevel = 0
Var CoffeePoint = 1
Var CoffeePoint = 1
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
DEBUGVAR "Try open collect.error timeout30"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml"
EndIf
TimerReset
Refresh
</EventTimeout>
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
If StepGetPoint = 0 Then
If PdpaAsk = 0 Then
Open "ROOT/taobin_project/xml/page_show_consent.xml"
Open "ROOT/taobin_project/xml/page_show_consent.xml"
Else
Var StepGetPoint = 1
Var TelephoneNumber = TelephoneNumberX
If UseSGPCollectFlag = 1 Then
GETACCEXT Param1 35
Else
@ -145,21 +149,21 @@
EndIf
Var Ext1a = ""
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.xml"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_2.xml"
EndIf
Else
If Ext1a = "" Then
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml"
Else
If Ext1a = "ok" Then
@ -180,7 +184,7 @@
INT PointTaobinTmp
INT TaobinPDPA
DEBUGVAR TaobinName
Var CatchNotMember = 0
If TaobinName = "" Then
@ -213,7 +217,7 @@
Var TNumberTaobinMemberXXX = TelephoneNumber
;Var PointTaobinTmp = 4
Var PointTaobin = PointTaobinTmp
Var pTaobin = PointTaobin
@ -235,14 +239,14 @@
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
@ -250,7 +254,7 @@
Var CoffeePointRank = CoffeePointRank + 0
Else
Var CoffeePointRank = CoffeePointRank + PointTaobin
EndIf
EndIf
Var CoffeePointRankTmp = CoffeePointRank
@ -261,13 +265,13 @@
;inter-xml-open
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml"
EndIf
;inter-xml-open
If CountryName = "Indonesia" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml"
EndIf
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.xml"
EndIf
;inter-xml-open
If CountryName = "Australia" Then
@ -276,71 +280,71 @@
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
EndIf
;inter-xml-open
If CountryName = "Singapore" Then
DEBUGVAR "Try open collect3.sgp"
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
EndIf
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
EndIf
Open "ROOT/taobin_project/xml/page_show_consent.xml"
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"
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"
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
EndIf
If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Else
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml"
EndIf
EndIf
EndIf
</EventActionOk>
<EventActionError>
<EventActionError>
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_error.lxml"
</EventActionError>
</EventActionError>
<EventMachine>
If MachineStage = "drink-success" Then
@ -416,4 +420,3 @@
</Popup>