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

This commit is contained in:
Pakin 2024-07-19 15:14:04 +07:00
commit 3a4ec3cd4a
9 changed files with 742 additions and 170 deletions

View file

@ -270,8 +270,12 @@
If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -288,9 +292,12 @@
If RoadShow = "true" Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -368,8 +375,12 @@
EndIf
If CART_INDEX >= 2 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -458,15 +469,23 @@
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If CART_INDEX >= 2 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -537,18 +556,26 @@
EndIf
EndIf
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If CART_INDEX >= 2 Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If CART_INDEX >= 2 Then
If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet