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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-04-26 11:13:23 +07:00
commit d3fc36d70f
2 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_collect_point_1.xml
View file

@ -14,6 +14,13 @@
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 0 Then
SAVELOG "Seeker.CollectPointMain = 0 Jump!!!"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf

32
xml/page_payment_code.xml
View file

@ -169,8 +169,9 @@
SAVELOG ECommerce
SPLIT ECommerce "/" 5 Seeker.VendingCode
SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
SPLIT ECommerce "/" 7 Seeker.VendingCampaignRI3
SPLIT ECommerce "/" 8 VendingCampaign1
SPLIT ECommerce "/" 9 ShouldCollectPoint
If Seeker.VendingCode = "" Then
Var Seeker.VendingCode = "C00"
@ -190,7 +191,9 @@
SAVELOG Seeker.VendingCode
SAVELOG Seeker.VendingCampaignRI3
SAVELOG ShouldCollectPoint
INT ShouldCollectPoint
If Seeker.VendingCode = "C00" Then
@ -226,24 +229,8 @@
If Seeker.IntVendingCampaign >= PayAmount Then
If IntVendingCampaign1 >= 0 Then
If Seeker.VendingCode = "FFR50" Then
Var Seeker.CollectPointMain = 0
Var Seeker.CollectPointPromotion = 0
Else
Var Seeker.CollectPointMain = 1
Var Seeker.CollectPointPromotion = 1
EndIf
EndIf
If Seeker.VendingCode = "MKF" Then
Var Seeker.CollectPointMain = 0
Var Seeker.CollectPointPromotion = 1
EndIf
If Seeker.VendingCode = "AFR" Then
Var Seeker.CollectPointMain = 0
Var Seeker.CollectPointPromotion = 1
If ShouldCollectPoint = 1 Then
Var Seeker.CollectPointMain = 1
EndIf
;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@ -277,8 +264,9 @@
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Else
Var Seeker.CollectPointMain = 1
Var Seeker.CollectPointPromotion = 1
If ShouldCollectPoint = 1 Then
Var Seeker.CollectPointMain = 1
EndIf
EndIf