pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

add poing New

Browse source
This commit is contained in:
miggaze 2022-07-12 12:19:44 +07:00
parent 6c7fa03468
commit 370de40385
9 changed files with 110 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -537,13 +537,13 @@
EndIf EndIf
DEBUGVAR NETCORE_EVENT_CNT_X ;DEBUGVAR NETCORE_EVENT_CNT_X
If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1 Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
If NETCORE_EVENT_CNT_X >= 5 Then If NETCORE_EVENT_CNT_X >= 30 Then
Var stop_now = "true" Var stop_now = "true"
Var MachineErrorDetailAll = "Netcore Lost" Var MachineErrorDetailAll = "Netcore Lost"
DEBUGVAR "NCIC07_EVENT_CNT" DEBUGVAR "NCIC07_EVENT_CNT"

2
xml/page_brewing3.xml
View file

@ -661,6 +661,7 @@
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf
@ -762,6 +763,7 @@
Var ErrTimeout = 1 Var ErrTimeout = 1
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf

2
xml/page_brewing3Conti.xml
View file

@ -535,6 +535,7 @@
EndIf EndIf
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf
@ -641,6 +642,7 @@
Var ErrTimeout = 1 Var ErrTimeout = 1
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf

39
xml/page_collect_point_1.xml
View file

@ -32,6 +32,28 @@
Var Seeker.FromConsent = 0 Var Seeker.FromConsent = 0
Var ParamCP = ""
Var ParamCP = ParamCP + Seeker.CampaignPPrice
Var ParamCP = ParamCP + "/"
Var ParamCP = ParamCP + Seeker.CampaignPCode
Var ParamCP = ParamCP + "/"
Var ParamCP = ParamCP + Seeker.CampaignPayChanel
Var ParamCP = ParamCP + "/"
Var CampaingRef = ""
GenHashWithTimeStamp CampaingRef
Var CampaingRef1 = ""
Var CampaingRef2 = ""
SUBSTRING CampaingRef 0 6 CampaingRef1
SUBSTRING CampaingRef 12 18 CampaingRef2
Var CampaingRef1 = CampaingRef1 + CampaingRef2
Var ParamCP = ParamCP + CampaingRef1
If Seeker.TNumberTaobinCredit = "" Then If Seeker.TNumberTaobinCredit = "" Then
@ -64,7 +86,7 @@
Var TelephoneNumber = Seeker.TNumberTaobinCredit Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var StepGetPoint = 0 Var StepGetPoint = 1
Var PdpaAsk = 0 Var PdpaAsk = 0
@ -75,7 +97,10 @@
SAVELOG "collect_point1-p71." SAVELOG "collect_point1-p71."
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf EndIf
@ -616,7 +641,7 @@
<EventClick> <EventClick>
If Tel_Confirm_Flag = 1 Then If Tel_Confirm_Flag = 1 Then
Var StepGetPoint = 0 Var StepGetPoint = 1
Var PdpaAsk = 0 Var PdpaAsk = 0
@ -627,7 +652,13 @@
SAVELOG "collect_point1-p583." SAVELOG "collect_point1-p583."
Var TelephoneNumberX = TelephoneNumber Var TelephoneNumberX = TelephoneNumber
GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
Var Param1 = Param1 + ParamCP
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf EndIf

54
xml/page_collect_point_2.xml
View file

@ -22,8 +22,9 @@
If PayOfflineMode = 1 Then If PayOfflineMode = 1 Then
Var Seeker.TaobinErrorNetwork = 1 Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = "" + PayAmount ;Var Seeker.PointTaobinStr = "" + PayAmount
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml" Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
@ -48,8 +49,9 @@
Var CoffeePoint = 1 Var CoffeePoint = 1
Var Seeker.TaobinErrorNetwork = 1 Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = "" + PayAmount ;Var Seeker.PointTaobinStr = "" + PayAmount
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
@ -88,11 +90,14 @@
Else Else
If Ext1a = "" Then If Ext1a = "" Then
Var Seeker.TaobinErrorNetwork = 1 Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = "" + PayAmount ;Var Seeker.PointTaobinStr = "" + PayAmount
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml" Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
@ -105,23 +110,35 @@
Var TaobinCoupons = Ext1g Var TaobinCoupons = Ext1g
Var TaobinExpire = Ext1f Var TaobinExpire = Ext1f
Var TaobinLevel = Ext1e Var TaobinLevel = Ext1e
Var TaobinPDPA = Ext1h
DEBUGVAR TaobinPDPA
Var PointTaobinTmp = Ext1i
DEBUGVAR PointTaobinTmp
INT PointTaobinTmp
INT TaobinPDPA
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
If TaobinLevel = 1 Then If TaobinLevel = 1 Then
Var PointTaobin = PayAmount / 20 Var PointTaobin = PayAmount / 20
Else Else
Var PointTaobin = PayAmount / 15 Var PointTaobin = PayAmount / 15
EndIf EndIf
Var PointTaobin = PointTaobinTmp
Var Seeker.PointTaobinStr = "" + PointTaobin ;Var Seeker.PointTaobinStr = "" + PointTaobin
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/"
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + PointTaobin ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + PointTaobin
Var Seeker.PointTaobinStr = ParamCP
Var CoffeePointRank = Ext1b Var CoffeePointRank = Ext1b
@ -141,13 +158,19 @@
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
If TaobinPDPA = 0 Then
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
Else Else
Var Seeker.TaobinErrorNetwork = 1 Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = "" + PayAmount ;Var Seeker.PointTaobinStr = "" + PayAmount
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml" Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
@ -169,8 +192,9 @@
Else Else
;Var CoffeePoint = 1 ;Var CoffeePoint = 1
Var Seeker.TaobinErrorNetwork = 1 Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = "" + PayAmount ;Var Seeker.PointTaobinStr = "" + PayAmount
Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml" Open "ROOT/taobin_project/xml/page_collect_point_error.xml"

4
xml/page_collect_point_3.xml
View file

@ -627,7 +627,7 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 5 Then If Timeout > 60 Then
@ -1128,7 +1128,7 @@
<Text> <Text>
<X> 310 </X> <X> 310 </X>
<Y> 1595 </Y> <Y> 1621 </Y>
<Size> 25 </Size> <Size> 25 </Size>
<Width> 1000 </Width> <Width> 1000 </Width>
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>

3
xml/page_payment.xml
View file

@ -136,6 +136,9 @@
DEBUGVAR Seeker.thankStrawFlag DEBUGVAR Seeker.thankStrawFlag
Var Seeker.PayWithQR = 0 Var Seeker.PayWithQR = 0
Var Seeker.CampaignPayChanel = "cash"
Var Seeker.CampaignPCode = SelectDrink
Var Seeker.CampaignPPrice = PriceDrink
If CupChecking = "true" Then If CupChecking = "true" Then
Var StageShowAlias = "Invisible" Var StageShowAlias = "Invisible"

18
xml/page_payment_cash.xml
View file

@ -45,6 +45,7 @@
EndIf EndIf
Var ReqPayInfoFlag2 = 0
DEBUGVAR QRCODETMP DEBUGVAR QRCODETMP
@ -508,6 +509,20 @@
VendingQR OFF VendingQR OFF
CoinVending OFF CoinVending OFF
If ReqPayInfoFlag2 = 1 Then
Var Seeker.CampaignPayChanel = "kbank"
EndIf
If ReqPayInfoFlag2 = 2 Then
Var Seeker.CampaignPayChanel = "shopee"
EndIf
If ReqPayInfoFlag2 = 3 Then
Var Seeker.CampaignPayChanel = "true"
EndIf
If Seeker = "curr" Then If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
EndIf EndIf
@ -532,6 +547,7 @@
Var QRCODE99KBANK = QRCODE99KBANK + Ext21 Var QRCODE99KBANK = QRCODE99KBANK + Ext21
Var QRCODETMP = QRCODE99KBANK Var QRCODETMP = QRCODE99KBANK
Var ReqPayInfoFlag = 0 Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 1
SAVELOG QRCODE99KBANK SAVELOG QRCODE99KBANK
SAVELOG Ext21 SAVELOG Ext21
@ -552,6 +568,7 @@
SAVELOG QRCODE99Shoppy SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0 Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 2
SAVELOG QRCODE99Shoppy SAVELOG QRCODE99Shoppy
SAVELOG Ext21 SAVELOG Ext21
@ -570,6 +587,7 @@
SAVELOG QRCODE99Shoppy SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0 Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 3
SAVELOG QRCODE99Shoppy SAVELOG QRCODE99Shoppy
SAVELOG Ext21 SAVELOG Ext21

8
xml/page_show_consent.xml
View file

@ -45,9 +45,9 @@
Var Seeker.FromConsent = 1 Var Seeker.FromConsent = 1
Var StepGetPoint = 1 Var StepGetPoint = 1
GETACCEXT TelephoneNumber 14 ;GETACCEXT TelephoneNumber 14
; goto lid straw ; goto lid straw
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
@ -102,9 +102,9 @@
Var Seeker.FromConsent = 1 Var Seeker.FromConsent = 1
Var StepGetPoint = 1 Var StepGetPoint = 1
GETACCEXT TelephoneNumber 14 ;GETACCEXT TelephoneNumber 14
; goto lid straw ; goto lid straw
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
</EventClick> </EventClick>
</Button> </Button>