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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-08-07 17:11:50 +07:00
commit ba805b10b3
15 changed files with 1166 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

19
xml/open_page_collect_point.ev Normal file
View file

@ -0,0 +1,19 @@
; default
Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
If Country = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.xml"
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Var PageCollectPoint1 = MemberPrompt
EndIf
EndIf
Open PageCollectPoint1

2
xml/page_payment_cashMore.xml
View file

@ -2020,7 +2020,7 @@ EndIf
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
;TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
; show consent
;Open "ROOT/taobin_project/xml/page_show_consent.xml"

4
xml/page_payment_storeCredit.xml
View file

@ -52,7 +52,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
Else
CoinVending BILLREJECT
@ -482,7 +482,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
Else
CoinVending BILLREJECT

8
xml/page_payment_storeCredit0.xml
View file

@ -55,7 +55,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
@ -76,7 +76,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
EndIf
@ -141,7 +141,7 @@
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
Else
Var Seeker.StoreCreditFlag = 1
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
@ -171,7 +171,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf

2
xml/page_payment_storeCredit3.xml
View file

@ -76,7 +76,7 @@
If Seeker.FreeVendingCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
Else

81
xml/page_thankyou.xml
View file

@ -410,17 +410,7 @@
DEBUGVAR ChangeFlag2
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -485,29 +475,10 @@
If Seeker.FreeVendingCampaign = 1 Then
If Seeker.CollectPointPromotion = 1 Then
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
Else
If Seeker.CollectPointMain = 1 Then
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
EndIf
If Seeker.IsLineMember = 0 Then
@ -531,17 +502,8 @@
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
Else
If GotoStoreCredit0 = 1 Then
@ -568,32 +530,14 @@
If Seeker.FreeVendingCampaign = 1 Then
;If ChildrenFree = 1 Then
; Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
; TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
;EndIf
If Seeker.CollectPointPromotion = 1 Then
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
Else
If Seeker.CollectPointMain = 1 Then
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
EndIf
@ -618,16 +562,7 @@
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
EndIf
EndIf