diff --git a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml
index b14c84c9..f2ae1036 100644
--- a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml
+++ b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml
@@ -215,9 +215,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/event/lipit/page_collect_point_pro_lipit_error.xml b/xml/event/lipit/page_collect_point_pro_lipit_error.xml
index 8da2a16e..035f0c1f 100644
--- a/xml/event/lipit/page_collect_point_pro_lipit_error.xml
+++ b/xml/event/lipit/page_collect_point_pro_lipit_error.xml
@@ -206,9 +206,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_error.xml b/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_error.xml
index eb9ef251..1a0d7605 100644
--- a/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_error.xml
+++ b/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_error.xml
@@ -279,9 +279,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_error.xml b/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_error.xml
index f238f9dd..243acae1 100644
--- a/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_error.xml
+++ b/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_error.xml
@@ -252,9 +252,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/event/pepween/page_collect_point_pro_pepween_error.xml b/xml/event/pepween/page_collect_point_pro_pepween_error.xml
index 267523f2..29dffa5c 100644
--- a/xml/event/pepween/page_collect_point_pro_pepween_error.xml
+++ b/xml/event/pepween/page_collect_point_pro_pepween_error.xml
@@ -151,9 +151,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml
index f3ec3acb..8c424a1d 100644
--- a/xml/page_check_member2.xml
+++ b/xml/page_check_member2.xml
@@ -971,9 +971,7 @@
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -1200,9 +1198,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
diff --git a/xml/page_check_member2_campaign.xml b/xml/page_check_member2_campaign.xml
index d370b066..56389551 100644
--- a/xml/page_check_member2_campaign.xml
+++ b/xml/page_check_member2_campaign.xml
@@ -761,9 +761,7 @@
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -819,9 +817,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -1196,9 +1192,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
diff --git a/xml/page_check_member3.xml b/xml/page_check_member3.xml
index f3e3d2f1..1eb63d4d 100644
--- a/xml/page_check_member3.xml
+++ b/xml/page_check_member3.xml
@@ -40,9 +40,7 @@
If Timeout > 30 Then
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -123,9 +121,7 @@
; goto lid straw
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
@@ -151,9 +147,7 @@
;AddData 11 TelephoneNumber BmiYear PointCrm GetScore
If MakeDrinkState = 1 Then
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml
index e9d7c96c..d83589a3 100644
--- a/xml/page_collect_point_1-3.xml
+++ b/xml/page_collect_point_1-3.xml
@@ -90,9 +90,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@@ -118,9 +116,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@@ -589,9 +585,7 @@
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
DEBUGVAR TelephoneNumber
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Var Param1 = TelephoneNumber + "/"
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index fb533a86..7f9d77b0 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -172,9 +172,7 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@@ -286,9 +284,7 @@
Var TelephoneNumberX = TelephoneNumber
DEBUGVAR TelephoneNumber
DEBUGVAR PepweenCollectPoint
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
Var Param1 = TelephoneNumber + "/"
@@ -826,9 +822,7 @@
AddData 45 TelPhoneNum drink_price param2 param3
EndIf
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
If ChildrenFree = 1 Then
Var Seeker.TNumberTaobinMember = TelephoneNumber
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index 84ac3aed..0a527020 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -192,8 +192,9 @@
;inter-xml-open
If CountryName = "Australia" Then
- Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
- EndIf
+ Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
+ Open pageCollectPoint
+ EndIf
;inter-xml-open
If CountryName = "Singapore" Then
diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml
index 7517daa6..826f74ec 100644
--- a/xml/page_collect_point_3.xml
+++ b/xml/page_collect_point_3.xml
@@ -691,9 +691,7 @@
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -860,9 +858,7 @@
EndIf
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
diff --git a/xml/page_collect_point_error.xml b/xml/page_collect_point_error.xml
index 4c88d68d..05be6c3e 100644
--- a/xml/page_collect_point_error.xml
+++ b/xml/page_collect_point_error.xml
@@ -30,9 +30,7 @@
If Timeout > 5 Then
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@@ -81,9 +79,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml
index 3d1ac2ae..5e3af989 100644
--- a/xml/page_display_get_free.xml
+++ b/xml/page_display_get_free.xml
@@ -84,9 +84,7 @@
If Timeout > 5 Then
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
@@ -174,9 +172,7 @@
; goto lid straw
- If PromotionIDCurrentOrder > 1 Then
- Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
- EndIf
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"