THAI: remove open page_display_Promo1Get1Free

xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml

@@ -215,9 +215,7 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

xml/event/lipit/page_collect_point_pro_lipit_error.xml

@@ -206,9 +206,7 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

xml/event/my_mint_my_moment/page_collect_point_pro_mymint_error.xml

@@ -279,9 +279,7 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_error.xml

@@ -252,9 +252,7 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

xml/event/pepween/page_collect_point_pro_pepween_error.xml

@@ -151,9 +151,7 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

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
 

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
 

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
 

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 + "/" 

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

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" 
+						Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
-					EndIf 
+						Open pageCollectPoint
+					EndIf
 
 					;inter-xml-open
 					If CountryName = "Singapore" Then

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

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 @@
 <EventClick> 
 	; 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"
 
 </EventClick>

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 @@
 <EventClick> 
 	; 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"